diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-04-06 23:47:37 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-04-06 23:47:37 +0800 |
| commit | 503f8822758fd6deb93e448bf37e1e3e70422e29 (patch) | |
| tree | f99701c3892d10a1f87bf204a7007f84aaa312a6 | |
| parent | 1ac44911b355ac18d279b7fff4c7db821689d9c7 (diff) | |
| download | gitlab-ce-8998_skip_pending_commits_if_not_head.tar.gz | |
Fix rubocop offenses8998_skip_pending_commits_if_not_head
| -rw-r--r-- | app/models/ci/pipeline.rb | 2 | ||||
| -rw-r--r-- | db/migrate/20170402231018_remove_index_for_users_current_sign_in_at.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb index 9165565d8fd..250ae496b06 100644 --- a/app/models/ci/pipeline.rb +++ b/app/models/ci/pipeline.rb @@ -70,7 +70,7 @@ module Ci pipeline.update_duration end - before_transition :canceled => any - [:canceled] do |pipeline| + before_transition canceled: any - [:canceled] do |pipeline| pipeline.auto_canceled_by = nil end diff --git a/db/migrate/20170402231018_remove_index_for_users_current_sign_in_at.rb b/db/migrate/20170402231018_remove_index_for_users_current_sign_in_at.rb index 8316ee9eb9f..6013598b835 100644 --- a/db/migrate/20170402231018_remove_index_for_users_current_sign_in_at.rb +++ b/db/migrate/20170402231018_remove_index_for_users_current_sign_in_at.rb @@ -14,7 +14,7 @@ class RemoveIndexForUsersCurrentSignInAt < ActiveRecord::Migration if Gitlab::Database.postgresql? execute 'DROP INDEX CONCURRENTLY index_users_on_current_sign_in_at;' else - remove_index :users, :current_sign_in_at + remove_concurrent_index :users, :current_sign_in_at end end end |