Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mr

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