Merge branch 'master' into glitch-soc/merge

Conflicts:
	app/controllers/invites_controller.rb
	app/serializers/initial_state_serializer.rb
	config/locales/ko.yml

app/views/accounts/show.html.haml

@@ -8,6 +8,7 @@
     %meta{ name: 'robots', content: 'noindex' }/
 
   %link{ rel: 'salmon', href: api_salmon_url(@account.id) }/
+  %link{ rel: 'alternate', type: 'application/rss+xml', href: account_url(@account, format: 'rss') }/
   %link{ rel: 'alternate', type: 'application/atom+xml', href: account_url(@account, format: 'atom') }/
   %link{ rel: 'alternate', type: 'application/activity+json', href: ActivityPub::TagManager.instance.uri_for(@account) }/
 

app/views/tags/_og.html.haml

@@ -2,5 +2,5 @@
 = opengraph 'og:url', tag_url(@tag)
 = opengraph 'og:type', 'website'
 = opengraph 'og:title', "##{@tag.name}"
-= opengraph 'og:description', t('about.about_hashtag_html', hashtag: @tag.name)
+= opengraph 'og:description', strip_tags(t('about.about_hashtag_html', hashtag: @tag.name))
 = opengraph 'twitter:card', 'summary'

app/views/tags/show.html.haml

@@ -2,6 +2,8 @@
   = "##{@tag.name}"
 
 - content_for :header_tags do
+  %link{ rel: 'alternate', type: 'application/rss+xml', href: tag_url(@tag, format: 'rss') }/
+
   %script#initial-state{ type: 'application/json' }!= json_escape(@initial_state_json)
   = render 'og'