diff options
| author | ThibG <thib@sitedethib.com> | 2018-12-09 16:38:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-09 16:38:09 +0100 |
| commit | c6b7b984891413cb1db673df2cbea12f8e6f0f05 (patch) | |
| tree | 46e3982da219f7a5ac34c3aecaf32f0990578d1d /app/models/concerns | |
| parent | e3682c9c1750e5e7e5d2f817e29f6760a18400ca (diff) | |
| parent | 4f59d1efd786c08cc63e0c14dceada80c37ab8da (diff) | |
Merge pull request #849 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/concerns')
| -rw-r--r-- | app/models/concerns/account_associations.rb | 3 | ||||
| -rw-r--r-- | app/models/concerns/account_counters.rb | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/app/models/concerns/account_associations.rb b/app/models/concerns/account_associations.rb index 9dba8000d..38e2481c5 100644 --- a/app/models/concerns/account_associations.rb +++ b/app/models/concerns/account_associations.rb @@ -50,5 +50,8 @@ module AccountAssociations # Account migrations belongs_to :moved_to_account, class_name: 'Account', optional: true + + # Hashtags + has_and_belongs_to_many :tags end end diff --git a/app/models/concerns/account_counters.rb b/app/models/concerns/account_counters.rb index fa3ec9a3d..3581df8dd 100644 --- a/app/models/concerns/account_counters.rb +++ b/app/models/concerns/account_counters.rb @@ -16,6 +16,7 @@ module AccountCounters :followers_count=, :increment_count!, :decrement_count!, + :last_status_at, to: :account_stat def account_stat |