Add latest changes from gitlab-org/gitlab@master

2 files changed, 10 insertions, 0 deletions

diff --git a/db/migrate/20200104113850_add_forking_access_level_to_project_feature.rb b/db/migrate/20200104113850_add_forking_access_level_to_project_feature.rb
new file mode 100644
index 00000000000..2c5f764ebf3
--- /dev/null
+++ b/db/migrate/20200104113850_add_forking_access_level_to_project_feature.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddForkingAccessLevelToProjectFeature < ActiveRecord::Migration[5.2]
+  DOWNTIME = false
+
+  def change
+    add_column :project_features, :forking_access_level, :integer
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index ebe75bf5abc..8c019f96f94 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -3167,6 +3167,7 @@ ActiveRecord::Schema.define(version: 2020_01_14_204949) do
     t.datetime "updated_at"
     t.integer "repository_access_level", default: 20, null: false
     t.integer "pages_access_level", null: false
+    t.integer "forking_access_level"
     t.index ["project_id"], name: "index_project_features_on_project_id", unique: true
   end