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
2018-05-25 18:59:02 +02:00
parent 9b75a13104 c7ac039697
commit 11cc2e099a
13 changed files with 330 additions and 319 deletions
@@ -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