Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-12-27 21:08:12 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2019-12-27 21:08:12 +0300
commit41c9fff024a72e6581e71c2ae080bdcb961a5601 (patch)
treeb36a268efbaee403fa424048f030d5e281dcfbf8 /db/migrate/20191106144901_add_state_to_merge_trains.rb
parentfb73ca3398c2ac49a616ab553e117b0586089702 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'db/migrate/20191106144901_add_state_to_merge_trains.rb')
-rw-r--r--db/migrate/20191106144901_add_state_to_merge_trains.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/db/migrate/20191106144901_add_state_to_merge_trains.rb b/db/migrate/20191106144901_add_state_to_merge_trains.rb
index e2256705f53..64a70575c91 100644
--- a/db/migrate/20191106144901_add_state_to_merge_trains.rb
+++ b/db/migrate/20191106144901_add_state_to_merge_trains.rb
@@ -9,7 +9,7 @@ class AddStateToMergeTrains < ActiveRecord::Migration[5.2]
disable_ddl_transaction!
def up
- add_column_with_default :merge_trains, :status, :integer, limit: 2, default: MERGE_TRAIN_STATUS_CREATED
+ add_column_with_default :merge_trains, :status, :integer, limit: 2, default: MERGE_TRAIN_STATUS_CREATED # rubocop:disable Migration/AddColumnWithDefault
end
def down