summaryrefslogtreecommitdiff
path: root/db/migrate
diff options
context:
space:
mode:
authorMathias Vestergaard <mathias.vestergaard@gmail.com>2016-05-20 01:58:34 +0200
committerTimothy Andrew <mail@timothyandrew.net>2016-07-13 13:24:26 +0530
commitf0577d838544152f558411ef1101d56c5852d92e (patch)
tree5c2a60db094b4cf570e90bd97db0219cdd353ef5 /db/migrate
parentecd301ddf618488a2b54827b44f9017f89b3d27d (diff)
downloadgitlab-ce-f0577d838544152f558411ef1101d56c5852d92e.tar.gz
Added "developers can merge" setting to protected branches
- Cherry-picked from `mvestergaard:branch-protection-dev-merge` - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4220
Diffstat (limited to 'db/migrate')
-rw-r--r--db/migrate/20160519203051_add_developers_can_merge_to_protected_branches.rb9
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