diff options
author | Rémy Coutable <remy@rymai.me> | 2016-07-18 15:31:07 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-07-18 15:31:07 +0000 |
commit | 08264f4334ff48d1274f066cd5b03455bc4befdf (patch) | |
tree | 2a5873d81f4b927f7bdac562906e4c42e6494b1e /db/migrate | |
parent | a6e99ab18e5bc3fe34a7e4b29ea28c95630b0c7a (diff) | |
parent | de1fa5010f705927ac5f5c01ce9595d3c52d44ef (diff) | |
download | gitlab-ce-08264f4334ff48d1274f066cd5b03455bc4befdf.tar.gz |
Merge branch 'undo-revert-of-4892' into 'master'
19396-api-allow-admin-owner-to-set-timestamp-when-changing-issue-state
Revert "Revert "Merge branch '18193-developers-can-merge' into 'master'""
## What does this MR do?
Reverts the revert of !4892 which lacked an EE MR at the time. This has been done in gitlab-org/gitlab-ee!564.
## What are the relevant issue numbers?
Closes #19872.
See merge request !5310
Diffstat (limited to 'db/migrate')
-rw-r--r-- | db/migrate/20160519203051_add_developers_can_merge_to_protected_branches.rb | 9 | ||||
-rw-r--r-- | db/migrate/20160629025435_add_column_in_progress_merge_commit_sha_to_merge_requests.rb | 8 |
2 files changed, 17 insertions, 0 deletions
diff --git a/db/migrate/20160519203051_add_developers_can_merge_to_protected_branches.rb b/db/migrate/20160519203051_add_developers_can_merge_to_protected_branches.rb new file mode 100644 index 00000000000..15ad8e8bcbb --- /dev/null +++ b/db/migrate/20160519203051_add_developers_can_merge_to_protected_branches.rb @@ -0,0 +1,9 @@ +class AddDevelopersCanMergeToProtectedBranches < ActiveRecord::Migration + include Gitlab::Database::MigrationHelpers + + disable_ddl_transaction! + + def change + add_column_with_default :protected_branches, :developers_can_merge, :boolean, default: false, allow_null: false + end +end diff --git a/db/migrate/20160629025435_add_column_in_progress_merge_commit_sha_to_merge_requests.rb b/db/migrate/20160629025435_add_column_in_progress_merge_commit_sha_to_merge_requests.rb new file mode 100644 index 00000000000..7c5f76572ef --- /dev/null +++ b/db/migrate/20160629025435_add_column_in_progress_merge_commit_sha_to_merge_requests.rb @@ -0,0 +1,8 @@ +# See http://doc.gitlab.com/ce/development/migration_style_guide.html +# for more information on how to write migrations for GitLab. + +class AddColumnInProgressMergeCommitShaToMergeRequests < ActiveRecord::Migration + def change + add_column :merge_requests, :in_progress_merge_commit_sha, :string + end +end |