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.

spec/policies/account_moderation_note_policy_spec.rb

@@ -4,7 +4,8 @@ require 'rails_helper'
 require 'pundit/rspec'
 
 RSpec.describe AccountModerationNotePolicy do
-  let(:subject) { described_class }
+  subject { described_class }
+
   let(:admin)   { Fabricate(:user, role: UserRole.find_by(name: 'Admin')).account }
   let(:john)    { Fabricate(:account) }
 

spec/policies/account_policy_spec.rb

@@ -4,7 +4,8 @@ require 'rails_helper'
 require 'pundit/rspec'
 
 RSpec.describe AccountPolicy do
-  let(:subject) { described_class }
+  subject { described_class }
+
   let(:admin)   { Fabricate(:user, role: UserRole.find_by(name: 'Admin')).account }
   let(:john)    { Fabricate(:account) }
   let(:alice)   { Fabricate(:account) }

spec/policies/backup_policy_spec.rb

@@ -4,8 +4,9 @@ require 'rails_helper'
 require 'pundit/rspec'
 
 RSpec.describe BackupPolicy do
-  let(:subject) { described_class }
-  let(:john)    { Fabricate(:account) }
+  subject { described_class }
+
+  let(:john) { Fabricate(:account) }
 
   permissions :create? do
     context 'when not user_signed_in?' do

spec/policies/custom_emoji_policy_spec.rb

@@ -4,7 +4,8 @@ require 'rails_helper'
 require 'pundit/rspec'
 
 RSpec.describe CustomEmojiPolicy do
-  let(:subject) { described_class }
+  subject { described_class }
+
   let(:admin)   { Fabricate(:user, role: UserRole.find_by(name: 'Admin')).account }
   let(:john)    { Fabricate(:account) }
 

spec/policies/domain_block_policy_spec.rb

@@ -4,7 +4,8 @@ require 'rails_helper'
 require 'pundit/rspec'
 
 RSpec.describe DomainBlockPolicy do
-  let(:subject) { described_class }
+  subject { described_class }
+
   let(:admin)   { Fabricate(:user, role: UserRole.find_by(name: 'Admin')).account }
   let(:john)    { Fabricate(:account) }
 

spec/policies/email_domain_block_policy_spec.rb

@@ -4,7 +4,8 @@ require 'rails_helper'
 require 'pundit/rspec'
 
 RSpec.describe EmailDomainBlockPolicy do
-  let(:subject) { described_class }
+  subject { described_class }
+
   let(:admin)   { Fabricate(:user, role: UserRole.find_by(name: 'Admin')).account }
   let(:john)    { Fabricate(:account) }
 

spec/policies/instance_policy_spec.rb

@@ -4,7 +4,8 @@ require 'rails_helper'
 require 'pundit/rspec'
 
 RSpec.describe InstancePolicy do
-  let(:subject) { described_class }
+  subject { described_class }
+
   let(:admin)   { Fabricate(:user, role: UserRole.find_by(name: 'Admin')).account }
   let(:john)    { Fabricate(:account) }
 

spec/policies/invite_policy_spec.rb

@@ -4,7 +4,8 @@ require 'rails_helper'
 require 'pundit/rspec'
 
 RSpec.describe InvitePolicy do
-  let(:subject) { described_class }
+  subject { described_class }
+
   let(:admin)   { Fabricate(:user, role: UserRole.find_by(name: 'Admin')).account }
   let(:john)    { Fabricate(:user).account }
 

spec/policies/relay_policy_spec.rb

@@ -4,7 +4,8 @@ require 'rails_helper'
 require 'pundit/rspec'
 
 RSpec.describe RelayPolicy do
-  let(:subject) { described_class }
+  subject { described_class }
+
   let(:admin)   { Fabricate(:user, role: UserRole.find_by(name: 'Admin')).account }
   let(:john)    { Fabricate(:account) }
 

spec/policies/report_note_policy_spec.rb

@@ -4,7 +4,8 @@ require 'rails_helper'
 require 'pundit/rspec'
 
 RSpec.describe ReportNotePolicy do
-  let(:subject) { described_class }
+  subject { described_class }
+
   let(:admin)   { Fabricate(:user, role: UserRole.find_by(name: 'Admin')).account }
   let(:john)    { Fabricate(:account) }
 

spec/policies/report_policy_spec.rb

@@ -4,7 +4,8 @@ require 'rails_helper'
 require 'pundit/rspec'
 
 RSpec.describe ReportPolicy do
-  let(:subject) { described_class }
+  subject { described_class }
+
   let(:admin)   { Fabricate(:user, role: UserRole.find_by(name: 'Admin')).account }
   let(:john)    { Fabricate(:account) }
 

spec/policies/settings_policy_spec.rb

@@ -4,7 +4,8 @@ require 'rails_helper'
 require 'pundit/rspec'
 
 RSpec.describe SettingsPolicy do
-  let(:subject) { described_class }
+  subject { described_class }
+
   let(:admin)   { Fabricate(:user, role: UserRole.find_by(name: 'Admin')).account }
   let(:john)    { Fabricate(:account) }
 

spec/policies/tag_policy_spec.rb

@@ -4,7 +4,8 @@ require 'rails_helper'
 require 'pundit/rspec'
 
 RSpec.describe TagPolicy do
-  let(:subject) { described_class }
+  subject { described_class }
+
   let(:admin)   { Fabricate(:user, role: UserRole.find_by(name: 'Admin')).account }
   let(:john)    { Fabricate(:account) }
 

spec/policies/user_policy_spec.rb

@@ -4,7 +4,8 @@ require 'rails_helper'
 require 'pundit/rspec'
 
 RSpec.describe UserPolicy do
-  let(:subject) { described_class }
+  subject { described_class }
+
   let(:admin)   { Fabricate(:user, role: UserRole.find_by(name: 'Admin')).account }
   let(:john)    { Fabricate(:account) }