diff options
| author | Bob Van Landuyt <bob@vanlanduyt.co> | 2017-06-27 13:05:02 +0200 |
|---|---|---|
| committer | Bob Van Landuyt <bob@vanlanduyt.co> | 2017-06-27 13:05:02 +0200 |
| commit | 7c53fcf11fff8a05442ae813c9da76a9ed710abd (patch) | |
| tree | 44210af7be69f090e662d19d9ec9a8395ab7110b | |
| parent | 397d3fd7d0cd352c94637a26b5ed25c025aa8bf9 (diff) | |
| download | gitlab-ce-bvl-rename-all-reserved-paths-mysql.tar.gz | |
Adjust for new static-analysis failuresbvl-rename-all-reserved-paths-mysql
| -rw-r--r-- | lib/gitlab/database/rename_reserved_paths_migration/v1/rename_base.rb | 4 | ||||
| -rw-r--r-- | spec/lib/gitlab/database/rename_reserved_paths_migration/v1_spec.rb | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_base.rb b/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_base.rb index c696c8baf7e..33f8939bc61 100644 --- a/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_base.rb +++ b/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_base.rb @@ -37,8 +37,8 @@ module Gitlab def perform_rename(routable, old_full_path, new_full_path) # skips callbacks & validations new_path = new_full_path.split('/').last - routable.class.where(id: routable). - update_all(path: new_path) + routable.class.where(id: routable) + .update_all(path: new_path) rename_routes(old_full_path, new_full_path) 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 9a48bc3a048..7695b95dc57 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 @@ -55,9 +55,9 @@ describe Gitlab::Database::RenameReservedPathsMigration::V1, :truncate do describe '#revert_renames' do it 'renames namespaces' do rename_namespaces = double - expect(described_class::RenameNamespaces). - to receive(:new).with([], subject). - and_return(rename_namespaces) + expect(described_class::RenameNamespaces) + .to receive(:new).with([], subject) + .and_return(rename_namespaces) expect(rename_namespaces).to receive(:revert_renames) subject.revert_renames @@ -65,9 +65,9 @@ describe Gitlab::Database::RenameReservedPathsMigration::V1, :truncate do it 'renames projects' do rename_projects = double - expect(described_class::RenameProjects). - to receive(:new).with([], subject). - and_return(rename_projects) + expect(described_class::RenameProjects) + .to receive(:new).with([], subject) + .and_return(rename_projects) expect(rename_projects).to receive(:revert_renames) subject.revert_renames |