diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-06-15 20:51:39 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-06-15 20:51:39 +0200 |
| commit | db200226b805db324a8efdfb951d7725eac3f9da (patch) | |
| tree | a7d8298fc65bbd81e2f843048240de6e4fceffcf /app/models | |
| parent | afceef74c2377192f100b9307068895ec0ec7d45 (diff) | |
| parent | 0df91c7b1e05952ebbfc552915e995d55af0a403 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: app/javascript/mastodon/initial_state.js db/schema.rb Upstream added a new field to initial_state. Not too sure about what happened with db/schema.rb though…
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/invite.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/invite.rb b/app/models/invite.rb index 2250e588e..d0cc427c4 100644 --- a/app/models/invite.rb +++ b/app/models/invite.rb @@ -11,6 +11,7 @@ # uses :integer default(0), not null # created_at :datetime not null # updated_at :datetime not null +# autofollow :boolean default(FALSE), not null # class Invite < ApplicationRecord |