diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-05-25 18:59:02 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-05-25 18:59:02 +0200 |
| commit | 11cc2e099ae44a73a1a3e1aa606d607551d3d021 (patch) | |
| tree | 2bb72be7d5db25ca5f1ae7ff6cf5944d419f4922 /app/lib | |
| parent | 9b75a1310420fdacaf2831585394635a01eef9e5 (diff) | |
| parent | c7ac0396975ba8f8c46edbd504d0ce1c582d1a4b (diff) | |
Merge branch 'master' into glitch-soc/merge-master
Conflicts: app/javascript/styles/mastodon-light.scss config/themes.yml Removed config/themes.yml, took upstream's mastodon-light.scss
Diffstat (limited to 'app/lib')
| -rw-r--r-- | app/lib/activitypub/activity/create.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb index ab1d63cd4..010ed1bb5 100644 --- a/app/lib/activitypub/activity/create.rb +++ b/app/lib/activitypub/activity/create.rb @@ -80,7 +80,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity hashtag = tag['name'].gsub(/\A#/, '').mb_chars.downcase hashtag = Tag.where(name: hashtag).first_or_initialize(name: hashtag) - status.tags << hashtag + status.tags << hashtag unless status.tags.include?(hashtag) rescue ActiveRecord::RecordInvalid nil end |