Merge branch 'master' into fix/gb/improve-updating-column-in-batches-helper

* master: (56 commits)
  File view buttons
  Don't reset the session when the example failed, because we need capybara-screenshot to have access to it
  Resolve "MR comment + system note highlight don't have the same width"
  Add feature spec for dashboard state filter tabs
  Wording of Mysql support.
  a new feature checklist and more elaborate documentation requirements
  Filter archived project in API v3 only if param present
  Revert to using links instead of buttons in Issuable Index tabs.
  Do not run the codeclimate job on docs-only changes
  Only show gray footer space if environment actions exist
  Migrate Gitlab::Git::Blob.find to Gitaly
  Backport filtered search lazy token consistent state fix
  Add a comment explaining how the branch clean up happens
  Fix Github::Representation::PullRequest#source_branch_exists?
  Add CHANGELOG
  Fix GitHub importer performance on branch existence check
  Rebuild the dynamic path before validating it
  Rename stage ref migration specs to match a class name
  Enable Style/DotPosition Rubocop :cop:
  Revert "Merge branch 'winh-merge-request-related-issues' into 'master'"
  ...

Conflicts:
	db/post_migrate/20170526185921_migrate_build_stage_reference.rb

4 files changed, 151 insertions, 151 deletions

diff --git a/spec/lib/gitlab/database/migration_helpers_spec.rb b/spec/lib/gitlab/database/migration_helpers_spec.rb
index 1efc19a2e65..fc269f33be9 100644
--- a/spec/lib/gitlab/database/migration_helpers_spec.rb
+++ b/spec/lib/gitlab/database/migration_helpers_spec.rb
@@ -57,15 +57,15 @@ describe Gitlab::Database::MigrationHelpers, lib: true do
         end
 
         it 'creates the index concurrently' do
-          expect(model).to receive(:add_index).
-            with(:users, :foo, algorithm: :concurrently)
+          expect(model).to receive(:add_index)
+            .with(:users, :foo, algorithm: :concurrently)
 
           model.add_concurrent_index(:users, :foo)
         end
 
         it 'creates unique index concurrently' do
-          expect(model).to receive(:add_index).
-            with(:users, :foo, { algorithm: :concurrently, unique: true })
+          expect(model).to receive(:add_index)
+            .with(:users, :foo, { algorithm: :concurrently, unique: true })
 
           model.add_concurrent_index(:users, :foo, unique: true)
         end
@@ -75,8 +75,8 @@ describe Gitlab::Database::MigrationHelpers, lib: true do
         it 'creates a regular index' do
           expect(Gitlab::Database).to receive(:postgresql?).and_return(false)
 
-          expect(model).to receive(:add_index).
-            with(:users, :foo, {})
+          expect(model).to receive(:add_index)
+            .with(:users, :foo, {})
 
           model.add_concurrent_index(:users, :foo)
         end
@@ -87,8 +87,8 @@ describe Gitlab::Database::MigrationHelpers, lib: true do
       it 'raises RuntimeError' do
         expect(model).to receive(:transaction_open?).and_return(true)
 
-        expect { model.add_concurrent_index(:users, :foo) }.
-          to raise_error(RuntimeError)
+        expect { model.add_concurrent_index(:users, :foo) }
+          .to raise_error(RuntimeError)
       end
     end
   end
@@ -106,15 +106,15 @@ describe Gitlab::Database::MigrationHelpers, lib: true do
         end
 
         it 'removes the index concurrently by column name' do
-          expect(model).to receive(:remove_index).
-            with(:users, { algorithm: :concurrently, column: :foo })
+          expect(model).to receive(:remove_index)
+            .with(:users, { algorithm: :concurrently, column: :foo })
 
           model.remove_concurrent_index(:users, :foo)
         end
 
         it 'removes the index concurrently by index name' do
-          expect(model).to receive(:remove_index).
-            with(:users, { algorithm: :concurrently, name: "index_x_by_y" })
+          expect(model).to receive(:remove_index)
+            .with(:users, { algorithm: :concurrently, name: "index_x_by_y" })
 
           model.remove_concurrent_index_by_name(:users, "index_x_by_y")
         end
@@ -124,8 +124,8 @@ describe Gitlab::Database::MigrationHelpers, lib: true do
         it 'removes an index' do
           expect(Gitlab::Database).to receive(:postgresql?).and_return(false)
 
-          expect(model).to receive(:remove_index).
-            with(:users, { column: :foo })
+          expect(model).to receive(:remove_index)
+            .with(:users, { column: :foo })
 
           model.remove_concurrent_index(:users, :foo)
         end
@@ -136,8 +136,8 @@ describe Gitlab::Database::MigrationHelpers, lib: true do
       it 'raises RuntimeError' do
         expect(model).to receive(:transaction_open?).and_return(true)
 
-        expect { model.remove_concurrent_index(:users, :foo) }.
-          to raise_error(RuntimeError)
+        expect { model.remove_concurrent_index(:users, :foo) }
+          .to raise_error(RuntimeError)
       end
     end
   end
@@ -162,8 +162,8 @@ describe Gitlab::Database::MigrationHelpers, lib: true do
         it 'creates a regular foreign key' do
           allow(Gitlab::Database).to receive(:mysql?).and_return(true)
 
-          expect(model).to receive(:add_foreign_key).
-            with(:projects, :users, column: :user_id, on_delete: :cascade)
+          expect(model).to receive(:add_foreign_key)
+            .with(:projects, :users, column: :user_id, on_delete: :cascade)
 
           model.add_concurrent_foreign_key(:projects, :users, column: :user_id)
         end
@@ -323,16 +323,16 @@ describe Gitlab::Database::MigrationHelpers, lib: true do
 
           expect(model).to receive(:transaction).and_yield
 
-          expect(model).to receive(:add_column).
-            with(:projects, :foo, :integer, default: nil)
+          expect(model).to receive(:add_column)
+            .with(:projects, :foo, :integer, default: nil)
 
-          expect(model).to receive(:change_column_default).
-            with(:projects, :foo, 10)
+          expect(model).to receive(:change_column_default)
+            .with(:projects, :foo, 10)
         end
 
         it 'adds the column while allowing NULL values' do
-          expect(model).to receive(:update_column_in_batches).
-            with(:projects, :foo, 10)
+          expect(model).to receive(:update_column_in_batches)
+            .with(:projects, :foo, 10)
 
           expect(model).not_to receive(:change_column_null)
 
@@ -342,22 +342,22 @@ describe Gitlab::Database::MigrationHelpers, lib: true do
         end
 
         it 'adds the column while not allowing NULL values' do
-          expect(model).to receive(:update_column_in_batches).
-            with(:projects, :foo, 10)
+          expect(model).to receive(:update_column_in_batches)
+            .with(:projects, :foo, 10)
 
-          expect(model).to receive(:change_column_null).
-            with(:projects, :foo, false)
+          expect(model).to receive(:change_column_null)
+            .with(:projects, :foo, false)
 
           model.add_column_with_default(:projects, :foo, :integer, default: 10)
         end
 
         it 'removes the added column whenever updating the rows fails' do
-          expect(model).to receive(:update_column_in_batches).
-            with(:projects, :foo, 10).
-            and_raise(RuntimeError)
+          expect(model).to receive(:update_column_in_batches)
+            .with(:projects, :foo, 10)
+            .and_raise(RuntimeError)
 
-          expect(model).to receive(:remove_column).
-            with(:projects, :foo)
+          expect(model).to receive(:remove_column)
+            .with(:projects, :foo)
 
           expect do
             model.add_column_with_default(:projects, :foo, :integer, default: 10)
@@ -365,12 +365,12 @@ describe Gitlab::Database::MigrationHelpers, lib: true do
         end
 
         it 'removes the added column whenever changing a column NULL constraint fails' do
-          expect(model).to receive(:change_column_null).
-            with(:projects, :foo, false).
-            and_raise(RuntimeError)
+          expect(model).to receive(:change_column_null)
+            .with(:projects, :foo, false)
+            .and_raise(RuntimeError)
 
-          expect(model).to receive(:remove_column).
-            with(:projects, :foo)
+          expect(model).to receive(:remove_column)
+            .with(:projects, :foo)
 
           expect do
             model.add_column_with_default(:projects, :foo, :integer, default: 10)
@@ -386,8 +386,8 @@ describe Gitlab::Database::MigrationHelpers, lib: true do
           allow(model).to receive(:change_column_null).with(:projects, :foo, false)
           allow(model).to receive(:change_column_default).with(:projects, :foo, 10)
 
-          expect(model).to receive(:add_column).
-            with(:projects, :foo, :integer, default: nil, limit: 8)
+          expect(model).to receive(:add_column)
+            .with(:projects, :foo, :integer, default: nil, limit: 8)
 
           model.add_column_with_default(:projects, :foo, :integer, default: 10, limit: 8)
         end
@@ -410,8 +410,8 @@ describe Gitlab::Database::MigrationHelpers, lib: true do
       it 'raises RuntimeError' do
         allow(model).to receive(:transaction_open?).and_return(true)
 
-        expect { model.rename_column_concurrently(:users, :old, :new) }.
-          to raise_error(RuntimeError)
+        expect { model.rename_column_concurrently(:users, :old, :new) }
+          .to raise_error(RuntimeError)
       end
     end
 
@@ -442,17 +442,17 @@ describe Gitlab::Database::MigrationHelpers, lib: true do
         it 'renames a column concurrently' do
           allow(Gitlab::Database).to receive(:postgresql?).and_return(false)
 
-          expect(model).to receive(:install_rename_triggers_for_mysql).
-            with(trigger_name, 'users', 'old', 'new')
+          expect(model).to receive(:install_rename_triggers_for_mysql)
+            .with(trigger_name, 'users', 'old', 'new')
 
-          expect(model).to receive(:add_column).
-            with(:users, :new, :integer,
+          expect(model).to receive(:add_column)
+            .with(:users, :new, :integer,
                  limit: old_column.limit,
                  precision: old_column.precision,
                  scale: old_column.scale)
 
-          expect(model).to receive(:change_column_default).
-            with(:users, :new, old_column.default)
+          expect(model).to receive(:change_column_default)
+            .with(:users, :new, old_column.default)
 
           expect(model).to receive(:update_column_in_batches)
 
@@ -469,17 +469,17 @@ describe Gitlab::Database::MigrationHelpers, lib: true do
         it 'renames a column concurrently' do
           allow(Gitlab::Database).to receive(:postgresql?).and_return(true)
 
-          expect(model).to receive(:install_rename_triggers_for_postgresql).
-            with(trigger_name, 'users', 'old', 'new')
+          expect(model).to receive(:install_rename_triggers_for_postgresql)
+            .with(trigger_name, 'users', 'old', 'new')
 
-          expect(model).to receive(:add_column).
-            with(:users, :new, :integer,
+          expect(model).to receive(:add_column)
+            .with(:users, :new, :integer,
                  limit: old_column.limit,
                  precision: old_column.precision,
                  scale: old_column.scale)
 
-          expect(model).to receive(:change_column_default).
-            with(:users, :new, old_column.default)
+          expect(model).to receive(:change_column_default)
+            .with(:users, :new, old_column.default)
 
           expect(model).to receive(:update_column_in_batches)
 
@@ -498,8 +498,8 @@ describe Gitlab::Database::MigrationHelpers, lib: true do
     it 'cleans up the renaming procedure for PostgreSQL' do
       allow(Gitlab::Database).to receive(:postgresql?).and_return(true)
 
-      expect(model).to receive(:remove_rename_triggers_for_postgresql).
-        with(:users, /trigger_.{12}/)
+      expect(model).to receive(:remove_rename_triggers_for_postgresql)
+        .with(:users, /trigger_.{12}/)
 
       expect(model).to receive(:remove_column).with(:users, :old)
 
@@ -509,8 +509,8 @@ describe Gitlab::Database::MigrationHelpers, lib: true do
     it 'cleans up the renaming procedure for MySQL' do
       allow(Gitlab::Database).to receive(:postgresql?).and_return(false)
 
-      expect(model).to receive(:remove_rename_triggers_for_mysql).
-        with(/trigger_.{12}/)
+      expect(model).to receive(:remove_rename_triggers_for_mysql)
+        .with(/trigger_.{12}/)
 
       expect(model).to receive(:remove_column).with(:users, :old)
 
@@ -520,8 +520,8 @@ describe Gitlab::Database::MigrationHelpers, lib: true do
 
   describe '#change_column_type_concurrently' do
     it 'changes the column type' do
-      expect(model).to receive(:rename_column_concurrently).
-        with('users', 'username', 'username_for_type_change', type: :text)
+      expect(model).to receive(:rename_column_concurrently)
+        .with('users', 'username', 'username_for_type_change', type: :text)
 
       model.change_column_type_concurrently('users', 'username', :text)
     end
@@ -529,11 +529,11 @@ describe Gitlab::Database::MigrationHelpers, lib: true do
 
   describe '#cleanup_concurrent_column_type_change' do
     it 'cleans up the type changing procedure' do
-      expect(model).to receive(:cleanup_concurrent_column_rename).
-        with('users', 'username', 'username_for_type_change')
+      expect(model).to receive(:cleanup_concurrent_column_rename)
+        .with('users', 'username', 'username_for_type_change')
 
-      expect(model).to receive(:rename_column).
-        with('users', 'username_for_type_change', 'username')
+      expect(model).to receive(:rename_column)
+        .with('users', 'username_for_type_change', 'username')
 
       model.cleanup_concurrent_column_type_change('users', 'username')
     end
@@ -541,11 +541,11 @@ describe Gitlab::Database::MigrationHelpers, lib: true do
 
   describe '#install_rename_triggers_for_postgresql' do
     it 'installs the triggers for PostgreSQL' do
-      expect(model).to receive(:execute).
-        with(/CREATE OR REPLACE FUNCTION foo()/m)
+      expect(model).to receive(:execute)
+        .with(/CREATE OR REPLACE FUNCTION foo()/m)
 
-      expect(model).to receive(:execute).
-        with(/CREATE TRIGGER foo/m)
+      expect(model).to receive(:execute)
+        .with(/CREATE TRIGGER foo/m)
 
       model.install_rename_triggers_for_postgresql('foo', :users, :old, :new)
     end
@@ -553,11 +553,11 @@ describe Gitlab::Database::MigrationHelpers, lib: true do
 
   describe '#install_rename_triggers_for_mysql' do
     it 'installs the triggers for MySQL' do
-      expect(model).to receive(:execute).
-        with(/CREATE TRIGGER foo_insert.+ON users/m)
+      expect(model).to receive(:execute)
+        .with(/CREATE TRIGGER foo_insert.+ON users/m)
 
-      expect(model).to receive(:execute).
-        with(/CREATE TRIGGER foo_update.+ON users/m)
+      expect(model).to receive(:execute)
+        .with(/CREATE TRIGGER foo_update.+ON users/m)
 
       model.install_rename_triggers_for_mysql('foo', :users, :old, :new)
     end
@@ -583,8 +583,8 @@ describe Gitlab::Database::MigrationHelpers, lib: true do
 
   describe '#rename_trigger_name' do
     it 'returns a String' do
-      expect(model.rename_trigger_name(:users, :foo, :bar)).
-        to match(/trigger_.{12}/)
+      expect(model.rename_trigger_name(:users, :foo, :bar))
+        .to match(/trigger_.{12}/)
     end
   end
 
@@ -623,11 +623,11 @@ describe Gitlab::Database::MigrationHelpers, lib: true do
                        lengths: [],
                        orders: [])
 
-        allow(model).to receive(:indexes_for).with(:issues, 'project_id').
-          and_return([index])
+        allow(model).to receive(:indexes_for).with(:issues, 'project_id')
+          .and_return([index])
 
-        expect(model).to receive(:add_concurrent_index).
-          with(:issues,
+        expect(model).to receive(:add_concurrent_index)
+          .with(:issues,
                %w(gl_project_id),
                unique: false,
                name: 'index_on_issues_gl_project_id',
@@ -650,11 +650,11 @@ describe Gitlab::Database::MigrationHelpers, lib: true do
                        lengths: [],
                        orders: [])
 
-        allow(model).to receive(:indexes_for).with(:issues, 'project_id').
-          and_return([index])
+        allow(model).to receive(:indexes_for).with(:issues, 'project_id')
+          .and_return([index])
 
-        expect(model).to receive(:add_concurrent_index).
-          with(:issues,
+        expect(model).to receive(:add_concurrent_index)
+          .with(:issues,
                %w(gl_project_id foobar),
                unique: false,
                name: 'index_on_issues_gl_project_id_foobar',
@@ -677,11 +677,11 @@ describe Gitlab::Database::MigrationHelpers, lib: true do
                        lengths: [],
                        orders: [])
 
-        allow(model).to receive(:indexes_for).with(:issues, 'project_id').
-          and_return([index])
+        allow(model).to receive(:indexes_for).with(:issues, 'project_id')
+          .and_return([index])
 
-        expect(model).to receive(:add_concurrent_index).
-          with(:issues,
+        expect(model).to receive(:add_concurrent_index)
+          .with(:issues,
                %w(gl_project_id),
                unique: false,
                name: 'index_on_issues_gl_project_id',
@@ -705,11 +705,11 @@ describe Gitlab::Database::MigrationHelpers, lib: true do
                        lengths: [],
                        orders: [])
 
-        allow(model).to receive(:indexes_for).with(:issues, 'project_id').
-          and_return([index])
+        allow(model).to receive(:indexes_for).with(:issues, 'project_id')
+          .and_return([index])
 
-        expect(model).to receive(:add_concurrent_index).
-          with(:issues,
+        expect(model).to receive(:add_concurrent_index)
+          .with(:issues,
                %w(gl_project_id),
                unique: false,
                name: 'index_on_issues_gl_project_id',
@@ -733,11 +733,11 @@ describe Gitlab::Database::MigrationHelpers, lib: true do
                        lengths: [],
                        orders: [])
 
-        allow(model).to receive(:indexes_for).with(:issues, 'project_id').
-          and_return([index])
+        allow(model).to receive(:indexes_for).with(:issues, 'project_id')
+          .and_return([index])
 
-        expect(model).to receive(:add_concurrent_index).
-          with(:issues,
+        expect(model).to receive(:add_concurrent_index)
+          .with(:issues,
                %w(gl_project_id),
                unique: false,
                name: 'index_on_issues_gl_project_id',
@@ -761,11 +761,11 @@ describe Gitlab::Database::MigrationHelpers, lib: true do
                        lengths: [],
                        orders: [])
 
-        allow(model).to receive(:indexes_for).with(:issues, 'project_id').
-          and_return([index])
+        allow(model).to receive(:indexes_for).with(:issues, 'project_id')
+          .and_return([index])
 
-        expect { model.copy_indexes(:issues, :project_id, :gl_project_id) }.
-          to raise_error(RuntimeError)
+        expect { model.copy_indexes(:issues, :project_id, :gl_project_id) }
+          .to raise_error(RuntimeError)
       end
     end
   end
@@ -777,11 +777,11 @@ describe Gitlab::Database::MigrationHelpers, lib: true do
                   to_table: 'projects',
                   on_delete: :cascade)
 
-      allow(model).to receive(:foreign_keys_for).with(:issues, :project_id).
-        and_return([fk])
+      allow(model).to receive(:foreign_keys_for).with(:issues, :project_id)
+        .and_return([fk])
 
-      expect(model).to receive(:add_concurrent_foreign_key).
-        with('issues', 'projects', column: :gl_project_id, on_delete: :cascade)
+      expect(model).to receive(:add_concurrent_foreign_key)
+        .with('issues', 'projects', column: :gl_project_id, on_delete: :cascade)
 
       model.copy_foreign_keys(:issues, :project_id, :gl_project_id)
     end
@@ -806,8 +806,8 @@ describe Gitlab::Database::MigrationHelpers, lib: true do
       end
 
       it 'builds the sql with correct functions' do
-        expect(model.replace_sql(Arel::Table.new(:users)[:first_name], "Alice", "Eve").to_s).
-          to include('regexp_replace')
+        expect(model.replace_sql(Arel::Table.new(:users)[:first_name], "Alice", "Eve").to_s)
+          .to include('regexp_replace')
       end
     end
 
@@ -817,8 +817,8 @@ describe Gitlab::Database::MigrationHelpers, lib: true do
       end
 
       it 'builds the sql with the correct functions' do
-        expect(model.replace_sql(Arel::Table.new(:users)[:first_name], "Alice", "Eve").to_s).
-          to include('locate', 'insert')
+        expect(model.replace_sql(Arel::Table.new(:users)[:first_name], "Alice", "Eve").to_s)
+          .to include('locate', 'insert')
       end
     end
 
diff --git a/spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_namespaces_spec.rb b/spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_namespaces_spec.rb
index 0a6e6bbe2e8..8125dedd3fc 100644
--- a/spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_namespaces_spec.rb
+++ b/spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_namespaces_spec.rb
@@ -21,8 +21,8 @@ describe Gitlab::Database::RenameReservedPathsMigration::V1::RenameNamespaces, :
         parent = create(:group, path: 'parent')
         child = create(:group, path: 'the-path', parent: parent)
 
-        found_ids = subject.namespaces_for_paths(type: :child).
-                      map(&:id)
+        found_ids = subject.namespaces_for_paths(type: :child)
+                      .map(&:id)
 
         expect(found_ids).to contain_exactly(child.id)
       end
@@ -38,8 +38,8 @@ describe Gitlab::Database::RenameReservedPathsMigration::V1::RenameNamespaces, :
                            path: 'the-path',
                            parent: create(:group))
 
-        found_ids = subject.namespaces_for_paths(type: :child).
-                      map(&:id)
+        found_ids = subject.namespaces_for_paths(type: :child)
+                      .map(&:id)
 
         expect(found_ids).to contain_exactly(namespace.id)
       end
@@ -53,8 +53,8 @@ describe Gitlab::Database::RenameReservedPathsMigration::V1::RenameNamespaces, :
                            path: 'the-path',
                            parent: create(:group))
 
-        found_ids = subject.namespaces_for_paths(type: :child).
-                      map(&:id)
+        found_ids = subject.namespaces_for_paths(type: :child)
+                      .map(&:id)
 
         expect(found_ids).to contain_exactly(namespace.id)
       end
@@ -68,8 +68,8 @@ describe Gitlab::Database::RenameReservedPathsMigration::V1::RenameNamespaces, :
                                   path: 'the-path',
                                   parent: create(:group))
 
-        found_ids = subject.namespaces_for_paths(type: :top_level).
-                      map(&:id)
+        found_ids = subject.namespaces_for_paths(type: :top_level)
+                      .map(&:id)
 
         expect(found_ids).to contain_exactly(root_namespace.id)
       end
@@ -81,8 +81,8 @@ describe Gitlab::Database::RenameReservedPathsMigration::V1::RenameNamespaces, :
                                   path: 'the-path',
                                   parent: create(:group))
 
-        found_ids = subject.namespaces_for_paths(type: :top_level).
-                      map(&:id)
+        found_ids = subject.namespaces_for_paths(type: :top_level)
+                      .map(&:id)
 
         expect(found_ids).to contain_exactly(root_namespace.id)
       end
@@ -140,9 +140,9 @@ describe Gitlab::Database::RenameReservedPathsMigration::V1::RenameNamespaces, :
     let(:namespace) { create(:group, name: 'the-path') }
 
     it 'renames paths & routes for the namespace' do
-      expect(subject).to receive(:rename_path_for_routable).
-                           with(namespace).
-                           and_call_original
+      expect(subject).to receive(:rename_path_for_routable)
+                           .with(namespace)
+                           .and_call_original
 
       subject.rename_namespace(namespace)
 
@@ -211,15 +211,15 @@ describe Gitlab::Database::RenameReservedPathsMigration::V1::RenameNamespaces, :
     end
 
     it 'renames top level namespaces the namespace' do
-      expect(subject).to receive(:rename_namespace).
-                           with(migration_namespace(top_level_namespace))
+      expect(subject).to receive(:rename_namespace)
+                           .with(migration_namespace(top_level_namespace))
 
       subject.rename_namespaces(type: :top_level)
     end
 
     it 'renames child namespaces' do
-      expect(subject).to receive(:rename_namespace).
-                           with(migration_namespace(child_namespace))
+      expect(subject).to receive(:rename_namespace)
+                           .with(migration_namespace(child_namespace))
 
       subject.rename_namespaces(type: :child)
     end
diff --git a/spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_projects_spec.rb b/spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_projects_spec.rb
index b04547f59fe..802f77ad430 100644
--- a/spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_projects_spec.rb
+++ b/spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_projects_spec.rb
@@ -13,8 +13,8 @@ describe Gitlab::Database::RenameReservedPathsMigration::V1::RenameProjects, :tr
       namespace = create(:namespace, path: 'hello')
       project = create(:empty_project, path: 'THE-path', namespace: namespace)
 
-      result_ids = described_class.new(['Hello/the-path'], migration).
-                     projects_for_paths.map(&:id)
+      result_ids = described_class.new(['Hello/the-path'], migration)
+                     .projects_for_paths.map(&:id)
 
       expect(result_ids).to contain_exactly(project.id)
     end
@@ -39,8 +39,8 @@ describe Gitlab::Database::RenameReservedPathsMigration::V1::RenameProjects, :tr
     end
 
     it 'invalidates the markdown cache of related projects' do
-      expect(subject).to receive(:remove_cached_html_for_projects).
-                           with(projects.map(&:id))
+      expect(subject).to receive(:remove_cached_html_for_projects)
+                           .with(projects.map(&:id))
 
       subject.rename_projects
     end
@@ -54,9 +54,9 @@ describe Gitlab::Database::RenameReservedPathsMigration::V1::RenameProjects, :tr
     end
 
     it 'renames path & route for the project' do
-      expect(subject).to receive(:rename_path_for_routable).
-                           with(project).
-                           and_call_original
+      expect(subject).to receive(:rename_path_for_routable)
+                           .with(project)
+                           .and_call_original
 
       subject.rename_project(project)
 
@@ -64,24 +64,24 @@ describe Gitlab::Database::RenameReservedPathsMigration::V1::RenameProjects, :tr
     end
 
     it 'moves the wiki & the repo' do
-      expect(subject).to receive(:move_repository).
-                           with(project, 'known-parent/the-path.wiki', 'known-parent/the-path0.wiki')
-      expect(subject).to receive(:move_repository).
-                           with(project, 'known-parent/the-path', 'known-parent/the-path0')
+      expect(subject).to receive(:move_repository)
+                           .with(project, 'known-parent/the-path.wiki', 'known-parent/the-path0.wiki')
+      expect(subject).to receive(:move_repository)
+                           .with(project, 'known-parent/the-path', 'known-parent/the-path0')
 
       subject.rename_project(project)
     end
 
     it 'moves uploads' do
-      expect(subject).to receive(:move_uploads).
-                           with('known-parent/the-path', 'known-parent/the-path0')
+      expect(subject).to receive(:move_uploads)
+                           .with('known-parent/the-path', 'known-parent/the-path0')
 
       subject.rename_project(project)
     end
 
     it 'moves pages' do
-      expect(subject).to receive(:move_pages).
-                           with('known-parent/the-path', 'known-parent/the-path0')
+      expect(subject).to receive(:move_pages)
+                           .with('known-parent/the-path', 'known-parent/the-path0')
 
       subject.rename_project(project)
     end
diff --git a/spec/lib/gitlab/database/rename_reserved_paths_migration/v1_spec.rb b/spec/lib/gitlab/database/rename_reserved_paths_migration/v1_spec.rb
index 04a6592aac5..1d5e58855c1 100644
--- a/spec/lib/gitlab/database/rename_reserved_paths_migration/v1_spec.rb
+++ b/spec/lib/gitlab/database/rename_reserved_paths_migration/v1_spec.rb
@@ -3,11 +3,11 @@ require 'spec_helper'
 shared_examples 'renames child namespaces' do |type|
   it 'renames namespaces' do
     rename_namespaces = double
-    expect(described_class::RenameNamespaces).
-      to receive(:new).with(['first-path', 'second-path'], subject).
-           and_return(rename_namespaces)
-    expect(rename_namespaces).to receive(:rename_namespaces).
-                                   with(type: :child)
+    expect(described_class::RenameNamespaces)
+      .to receive(:new).with(['first-path', 'second-path'], subject)
+           .and_return(rename_namespaces)
+    expect(rename_namespaces).to receive(:rename_namespaces)
+                                   .with(type: :child)
 
     subject.rename_wildcard_paths(['first-path', 'second-path'])
   end
@@ -29,9 +29,9 @@ describe Gitlab::Database::RenameReservedPathsMigration::V1, :truncate do
 
     it 'should rename projects' do
       rename_projects = double
-      expect(described_class::RenameProjects).
-        to receive(:new).with(['the-path'], subject).
-             and_return(rename_projects)
+      expect(described_class::RenameProjects)
+        .to receive(:new).with(['the-path'], subject)
+             .and_return(rename_projects)
 
       expect(rename_projects).to receive(:rename_projects)
 
@@ -42,11 +42,11 @@ describe Gitlab::Database::RenameReservedPathsMigration::V1, :truncate do
   describe '#rename_root_paths' do
     it 'should rename namespaces' do
       rename_namespaces = double
-      expect(described_class::RenameNamespaces).
-        to receive(:new).with(['the-path'], subject).
-             and_return(rename_namespaces)
-      expect(rename_namespaces).to receive(:rename_namespaces).
-                           with(type: :top_level)
+      expect(described_class::RenameNamespaces)
+        .to receive(:new).with(['the-path'], subject)
+             .and_return(rename_namespaces)
+      expect(rename_namespaces).to receive(:rename_namespaces)
+                           .with(type: :top_level)
 
       subject.rename_root_paths('the-path')
     end