diff options
author | Rémy Coutable <remy@rymai.me> | 2016-07-18 10:16:56 +0200 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-07-18 10:16:56 +0200 |
commit | 2cf7f09b1e9ccb000433374a42bd7b33b73f8116 (patch) | |
tree | 743e4ed2a6f2739541891749a6ef31bfd09e6805 /db/migrate/20160519203051_add_developers_can_merge_to_protected_branches.rb | |
parent | 1266e2664e7b080b440f5fc004424418284ee87b (diff) | |
download | gitlab-ce-2cf7f09b1e9ccb000433374a42bd7b33b73f8116.tar.gz |
Revert "Revert "Merge branch '18193-developers-can-merge' into 'master'
""
This reverts commit 530f5158e297f3cde27f3566cfe13bad74ba3b50.
See !4892.
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'db/migrate/20160519203051_add_developers_can_merge_to_protected_branches.rb')
-rw-r--r-- | db/migrate/20160519203051_add_developers_can_merge_to_protected_branches.rb | 9 |
1 files changed, 9 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 |