summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorMarco Wessel <marco@poop.nl>2015-01-25 16:33:54 +0100
committerMarco Wessel <marco@poop.nl>2015-01-25 17:09:10 +0100
commitaad6ceaef9ccfba8e058012a0877b80c103a3838 (patch)
tree33042a755f2c35024c140f20e9d63aba7e450ff4 /db
parent254d1d7aa07fd1b45dd4090e98bcba86f5d3c699 (diff)
downloadgitlab-ce-aad6ceaef9ccfba8e058012a0877b80c103a3838.tar.gz
Allow configuring protection of the default branch upon first push
Diffstat (limited to 'db')
-rw-r--r--db/migrate/20150125163100_add_default_branch_protection_setting.rb5
-rw-r--r--db/schema.rb3
2 files changed, 7 insertions, 1 deletions
diff --git a/db/migrate/20150125163100_add_default_branch_protection_setting.rb b/db/migrate/20150125163100_add_default_branch_protection_setting.rb
new file mode 100644
index 00000000000..5020daf55f3
--- /dev/null
+++ b/db/migrate/20150125163100_add_default_branch_protection_setting.rb
@@ -0,0 +1,5 @@
+class AddDefaultBranchProtectionSetting < ActiveRecord::Migration
+ def change
+ add_column :application_settings, :default_branch_protection, :integer, :default => 2
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 29466f048eb..124023545f9 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,13 +11,14 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 20150116234544) do
+ActiveRecord::Schema.define(version: 20150125163100) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
create_table "application_settings", force: true do |t|
t.integer "default_projects_limit"
+ t.integer "default_branch_protection"
t.boolean "signup_enabled"
t.boolean "signin_enabled"
t.boolean "gravatar_enabled"