diff options
author | Valery Sizov <valery@gitlab.com> | 2017-09-29 19:07:27 +0300 |
---|---|---|
committer | Valery Sizov <valery@gitlab.com> | 2017-09-29 19:07:27 +0300 |
commit | bd68e9add190c5472e309f5d046194d544aa64ce (patch) | |
tree | e7fa9637c2d5232544f0c5b91f293a59cccaee7b /db | |
parent | 3468ca835d6b5f410ffeba3bbe3964371ef8349f (diff) | |
download | gitlab-ce-bd68e9add190c5472e309f5d046194d544aa64ce.tar.gz |
[Port semi-linear history from EE] Move migration to CE and `merge_method` method
Diffstat (limited to 'db')
-rw-r--r-- | db/migrate/20141126120926_add_merge_request_rebase_enabled_to_projects.rb | 17 | ||||
-rw-r--r-- | db/schema.rb | 1 |
2 files changed, 18 insertions, 0 deletions
diff --git a/db/migrate/20141126120926_add_merge_request_rebase_enabled_to_projects.rb b/db/migrate/20141126120926_add_merge_request_rebase_enabled_to_projects.rb new file mode 100644 index 00000000000..3dafdf0fde4 --- /dev/null +++ b/db/migrate/20141126120926_add_merge_request_rebase_enabled_to_projects.rb @@ -0,0 +1,17 @@ +# rubocop:disable all +class AddMergeRequestRebaseEnabledToProjects < ActiveRecord::Migration + include Gitlab::Database::MigrationHelpers + + # Set this constant to true if this migration requires downtime. + DOWNTIME = false + + disable_ddl_transaction! + + def up + add_column_with_default(:projects, :merge_requests_rebase_enabled, :boolean, default: false) + end + + def down + remove_column(:projects, :merge_requests_rebase_enabled) + end +end diff --git a/db/schema.rb b/db/schema.rb index ad0dba99488..7c7ee0b9d33 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1217,6 +1217,7 @@ ActiveRecord::Schema.define(version: 20170921115009) do t.boolean "resolve_outdated_diff_discussions" t.boolean "repository_read_only" t.boolean "merge_requests_ff_only_enabled", default: false + t.boolean "merge_requests_rebase_enabled", default: false, null: false end add_index "projects", ["ci_id"], name: "index_projects_on_ci_id", using: :btree |