Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream

Conflicts:
- `db/migrate/20180831171112_create_bookmarks.rb`:
  Upstream ran a lint fix on this file, but this file is different in
  glitch-soc because the feature was added much earlier.
  Ran the lint fix on our own version of the file.

app/views/accounts/show.rss.ruby

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSS::Builder.build do |doc|
   doc.title(display_name(@account))
   doc.description(I18n.t('rss.descriptions.account', acct: @account.local_username_and_domain))

app/views/tags/show.rss.ruby

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSS::Builder.build do |doc|
   doc.title("##{@tag.display_name}")
   doc.description(I18n.t('rss.descriptions.tag', hashtag: @tag.display_name))

app/views/well_known/host_meta/show.xml.ruby

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 doc = Ox::Document.new(version: '1.0')
 
 doc << Ox::Element.new('XRD').tap do |xrd|