diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-20 14:34:42 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-20 14:34:42 +0000 |
commit | 9f46488805e86b1bc341ea1620b866016c2ce5ed (patch) | |
tree | f9748c7e287041e37d6da49e0a29c9511dc34768 /db/migrate/20190611161641_add_target_project_id_to_merge_trains.rb | |
parent | dfc92d081ea0332d69c8aca2f0e745cb48ae5e6d (diff) | |
download | gitlab-ce-9f46488805e86b1bc341ea1620b866016c2ce5ed.tar.gz |
Add latest changes from gitlab-org/gitlab@13-0-stable-ee
Diffstat (limited to 'db/migrate/20190611161641_add_target_project_id_to_merge_trains.rb')
-rw-r--r-- | db/migrate/20190611161641_add_target_project_id_to_merge_trains.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/db/migrate/20190611161641_add_target_project_id_to_merge_trains.rb b/db/migrate/20190611161641_add_target_project_id_to_merge_trains.rb index 553e9371ab3..7b73202ab8d 100644 --- a/db/migrate/20190611161641_add_target_project_id_to_merge_trains.rb +++ b/db/migrate/20190611161641_add_target_project_id_to_merge_trains.rb @@ -5,10 +5,14 @@ class AddTargetProjectIdToMergeTrains < ActiveRecord::Migration[5.1] DOWNTIME = false + # rubocop:disable Rails/NotNullColumn + # rubocop:disable Migration/AddReference + # rubocop:disable Migration/AddLimitToTextColumns def change - # rubocop:disable Rails/NotNullColumn, Migration/AddReference add_reference :merge_trains, :target_project, null: false, index: true, foreign_key: { on_delete: :cascade, to_table: :projects }, type: :integer add_column :merge_trains, :target_branch, :text, null: false - # rubocop:enable Rails/NotNullColumn, Migration/AddReference end + # rubocop:enable Migration/AddLimitToTextColumns + # rubocop:enable Migration/AddReference + # rubocop:enable Rails/NotNullColumn end |