summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-10-18 17:48:27 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2016-10-18 17:48:27 +0200
commit19300a1a3dff8974a3e653d71dcc9d528436efd8 (patch)
treec8e281ddae7fe430e521a339d5992a4b46bb82fc /db
parent3032a0ca891808c9aa1ba69d540bf97e40a84670 (diff)
parent146e0cbc4dfb857e0eb44777c40da5df56f376e0 (diff)
downloadgitlab-ce-19300a1a3dff8974a3e653d71dcc9d528436efd8.tar.gz
Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mr22191-delete-dynamic-envs-mr
Diffstat (limited to 'db')
-rw-r--r--db/migrate/20161012180455_add_repository_access_level_to_project_feature.rb14
-rw-r--r--db/schema.rb1
2 files changed, 15 insertions, 0 deletions
diff --git a/db/migrate/20161012180455_add_repository_access_level_to_project_feature.rb b/db/migrate/20161012180455_add_repository_access_level_to_project_feature.rb
new file mode 100644
index 00000000000..7b33da3ea11
--- /dev/null
+++ b/db/migrate/20161012180455_add_repository_access_level_to_project_feature.rb
@@ -0,0 +1,14 @@
+class AddRepositoryAccessLevelToProjectFeature < ActiveRecord::Migration
+ include Gitlab::Database::MigrationHelpers
+ disable_ddl_transaction!
+
+ DOWNTIME = false
+
+ def up
+ add_column_with_default(:project_features, :repository_access_level, :integer, default: ProjectFeature::ENABLED)
+ end
+
+ def down
+ remove_column :project_features, :repository_access_level
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index d4e35626e9b..5ce855fe08f 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -832,6 +832,7 @@ ActiveRecord::Schema.define(version: 20161017095000) do
t.integer "builds_access_level"
t.datetime "created_at"
t.datetime "updated_at"
+ t.integer "repository_access_level", default: 20, null: false
end
add_index "project_features", ["project_id"], name: "index_project_features_on_project_id", using: :btree