summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPawel Chojnacki <pawel@chojnacki.ws>2017-03-28 15:54:02 +0200
committerPawel Chojnacki <pawel@chojnacki.ws>2017-03-28 15:54:02 +0200
commit5e2219db48719af5ca971f9222fffa7bd66cb6d8 (patch)
treed433f24c0c1d49d47de1c687dd2d399ff27b3da6
parentd3e794e26f806fe491269a74e76c39669433c0fe (diff)
downloadgitlab-ce-5e2219db48719af5ca971f9222fffa7bd66cb6d8.tar.gz
Fix unreversible migration, and small rubocop warnings
-rw-r--r--db/migrate/20170327091750_add_created_at_index_to_deployments.rb6
-rw-r--r--spec/controllers/projects/deployments_controller_spec.rb4
2 files changed, 7 insertions, 3 deletions
diff --git a/db/migrate/20170327091750_add_created_at_index_to_deployments.rb b/db/migrate/20170327091750_add_created_at_index_to_deployments.rb
index cc615208c41..9cc35d08e1a 100644
--- a/db/migrate/20170327091750_add_created_at_index_to_deployments.rb
+++ b/db/migrate/20170327091750_add_created_at_index_to_deployments.rb
@@ -5,7 +5,11 @@ class AddCreatedAtIndexToDeployments < ActiveRecord::Migration
disable_ddl_transaction!
- def change
+ def up
add_concurrent_index :deployments, :created_at
end
+
+ def down
+ remove_index :deployments, :created_at
+ end
end
diff --git a/spec/controllers/projects/deployments_controller_spec.rb b/spec/controllers/projects/deployments_controller_spec.rb
index 7b7f16e14da..fbe510fb539 100644
--- a/spec/controllers/projects/deployments_controller_spec.rb
+++ b/spec/controllers/projects/deployments_controller_spec.rb
@@ -20,7 +20,7 @@ describe Projects::DeploymentsController do
create(:deployment, environment: environment, created_at: 7.hours.ago)
create(:deployment, environment: environment)
- get :index, environment_params(:after => 8.hours.ago)
+ get :index, environment_params(after: 8.hours.ago)
expect(response).to be_ok
@@ -41,7 +41,7 @@ describe Projects::DeploymentsController do
end
end
- def environment_params(opts={})
+ def environment_params(opts = {})
opts.reverse_merge(namespace_id: project.namespace, project_id: project, environment_id: environment.id)
end
end