Add latest changes from gitlab-org/gitlab@master

3 files changed, 22 insertions, 1 deletions

diff --git a/db/migrate/20201123081307_add_operations_project_feature_to_metrics.rb b/db/migrate/20201123081307_add_operations_project_feature_to_metrics.rb
new file mode 100644
index 00000000000..6801b49fae5
--- /dev/null
+++ b/db/migrate/20201123081307_add_operations_project_feature_to_metrics.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class AddOperationsProjectFeatureToMetrics < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  def up
+    with_lock_retries do
+      add_column :project_features, :operations_access_level, :integer, default: 20, null: false
+    end
+  end
+
+  def down
+    with_lock_retries do
+      remove_column :project_features, :operations_access_level
+    end
+  end
+end
diff --git a/db/schema_migrations/20201123081307 b/db/schema_migrations/20201123081307
new file mode 100644
index 00000000000..5169f80108d
--- /dev/null
+++ b/db/schema_migrations/20201123081307
@@ -0,0 +1 @@
+9b212f5fd6f58123f0d46249c82b2da49af9bcdd36bcc0de610c4be186b17345
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index 2559cecd6db..a895fd6414e 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -15126,7 +15126,8 @@ CREATE TABLE project_features (
     pages_access_level integer NOT NULL,
     forking_access_level integer,
     metrics_dashboard_access_level integer,
-    requirements_access_level integer DEFAULT 20 NOT NULL
+    requirements_access_level integer DEFAULT 20 NOT NULL,
+    operations_access_level integer DEFAULT 20 NOT NULL
 );
 
 CREATE SEQUENCE project_features_id_seq