summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-07-15 18:01:43 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2016-07-15 18:01:43 +0200
commit9d72d902cf21c786b871eced12609a793596cf29 (patch)
tree50c3bf031fe5cbb4bcd3b4bd723b1554e1c56144
parent7993fc1b89f6a8903fea0aa9586b1ed1d8a3b29e (diff)
downloadgitlab-ce-track-pipeline-user.tar.gz
Make rubocop happytrack-pipeline-user
-rw-r--r--db/migrate/20160715134306_add_index_for_pipeline_user_id.rb2
-rw-r--r--spec/services/create_commit_builds_service_spec.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/db/migrate/20160715134306_add_index_for_pipeline_user_id.rb b/db/migrate/20160715134306_add_index_for_pipeline_user_id.rb
index ac5d2bec681..e09caa0e6d7 100644
--- a/db/migrate/20160715134306_add_index_for_pipeline_user_id.rb
+++ b/db/migrate/20160715134306_add_index_for_pipeline_user_id.rb
@@ -2,6 +2,6 @@ class AddIndexForPipelineUserId < ActiveRecord::Migration
include Gitlab::Database::MigrationHelpers
def change
- add_index :ci_commits, :user_id
+ add_concurrent_index :ci_commits, :user_id
end
end
diff --git a/spec/services/create_commit_builds_service_spec.rb b/spec/services/create_commit_builds_service_spec.rb
index 7caf69bc870..d4c5e584421 100644
--- a/spec/services/create_commit_builds_service_spec.rb
+++ b/spec/services/create_commit_builds_service_spec.rb
@@ -24,7 +24,7 @@ describe CreateCommitBuildsService, services: true do
it { expect(pipeline).to be_valid }
it { expect(pipeline).to be_persisted }
it { expect(pipeline).to eq(project.pipelines.last) }
- it { expect(pipeline).to have_attributes(:user => user) }
+ it { expect(pipeline).to have_attributes(user: user) }
it { expect(pipeline.builds.first).to be_kind_of(Ci::Build) }
end