Add latest changes from gitlab-org/gitlab@master

5 files changed, 114 insertions, 1 deletions

diff --git a/db/migrate/20200524104346_add_source_to_resource_state_event.rb b/db/migrate/20200524104346_add_source_to_resource_state_event.rb
new file mode 100644
index 00000000000..a1d1575bb02
--- /dev/null
+++ b/db/migrate/20200524104346_add_source_to_resource_state_event.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class AddSourceToResourceStateEvent < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    unless column_exists?(:resource_state_events, :source_commit)
+      add_column :resource_state_events, :source_commit, :text
+    end
+
+    add_text_limit :resource_state_events, :source_commit, 40
+  end
+
+  def down
+    remove_column :resource_state_events, :source_commit
+  end
+end
diff --git a/db/migrate/20200615141554_add_closed_by_fields_to_resource_state_events.rb b/db/migrate/20200615141554_add_closed_by_fields_to_resource_state_events.rb
new file mode 100644
index 00000000000..ba11e64e667
--- /dev/null
+++ b/db/migrate/20200615141554_add_closed_by_fields_to_resource_state_events.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class AddClosedByFieldsToResourceStateEvents < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  def up
+    add_column :resource_state_events, :close_after_error_tracking_resolve, :boolean, default: false, null: false
+    add_column :resource_state_events, :close_auto_resolve_prometheus_alert, :boolean, default: false, null: false
+  end
+
+  def down
+    remove_column :resource_state_events, :close_auto_resolve_prometheus_alert, :boolean
+    remove_column :resource_state_events, :close_after_error_tracking_resolve, :boolean
+  end
+end
diff --git a/db/migrate/20200617205000_add_deploy_key_id_to_push_access_levels.rb b/db/migrate/20200617205000_add_deploy_key_id_to_push_access_levels.rb
new file mode 100644
index 00000000000..11b92c2a321
--- /dev/null
+++ b/db/migrate/20200617205000_add_deploy_key_id_to_push_access_levels.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class AddDeployKeyIdToPushAccessLevels < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    unless column_exists?(:protected_branch_push_access_levels, :deploy_key_id)
+      add_column :protected_branch_push_access_levels, :deploy_key_id, :integer
+    end
+
+    add_concurrent_foreign_key :protected_branch_push_access_levels, :keys, column: :deploy_key_id, on_delete: :cascade
+    add_concurrent_index :protected_branch_push_access_levels, :deploy_key_id, name: 'index_deploy_key_id_on_protected_branch_push_access_levels'
+  end
+
+  def down
+    remove_column :protected_branch_push_access_levels, :deploy_key_id
+  end
+end
diff --git a/db/migrate/20200623073431_add_source_merge_request_id_to_resource_state_events.rb b/db/migrate/20200623073431_add_source_merge_request_id_to_resource_state_events.rb
new file mode 100644
index 00000000000..8970797d3c0
--- /dev/null
+++ b/db/migrate/20200623073431_add_source_merge_request_id_to_resource_state_events.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+class AddSourceMergeRequestIdToResourceStateEvents < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  INDEX_NAME = 'index_resource_state_events_on_source_merge_request_id'
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    unless column_exists?(:resource_state_events, :source_merge_request_id)
+      add_column :resource_state_events, :source_merge_request_id, :bigint
+    end
+
+    unless index_exists?(:resource_state_events, :source_merge_request_id, name: INDEX_NAME)
+      add_index :resource_state_events, :source_merge_request_id, name: INDEX_NAME # rubocop: disable Migration/AddIndex
+    end
+
+    unless foreign_key_exists?(:resource_state_events, :merge_requests, column: :source_merge_request_id)
+      with_lock_retries do
+        add_foreign_key :resource_state_events, :merge_requests, column: :source_merge_request_id, on_delete: :nullify # rubocop:disable Migration/AddConcurrentForeignKey
+      end
+    end
+  end
+
+  def down
+    with_lock_retries do
+      remove_column :resource_state_events, :source_merge_request_id
+    end
+  end
+end
diff --git a/db/structure.sql b/db/structure.sql
index 3afb7fc6ccb..0c6d71b5021 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -14502,7 +14502,8 @@ CREATE TABLE public.protected_branch_push_access_levels (
     created_at timestamp without time zone NOT NULL,
     updated_at timestamp without time zone NOT NULL,
     user_id integer,
-    group_id integer
+    group_id integer,
+    deploy_key_id integer
 );
 
 CREATE SEQUENCE public.protected_branch_push_access_levels_id_seq
@@ -14854,6 +14855,11 @@ CREATE TABLE public.resource_state_events (
     created_at timestamp with time zone NOT NULL,
     state smallint NOT NULL,
     epic_id integer,
+    source_commit text,
+    close_after_error_tracking_resolve boolean DEFAULT false NOT NULL,
+    close_auto_resolve_prometheus_alert boolean DEFAULT false NOT NULL,
+    source_merge_request_id bigint,
+    CONSTRAINT check_f0bcfaa3a2 CHECK ((char_length(source_commit) <= 40)),
     CONSTRAINT state_events_must_belong_to_issue_or_merge_request_or_epic CHECK ((((issue_id <> NULL::bigint) AND (merge_request_id IS NULL) AND (epic_id IS NULL)) OR ((issue_id IS NULL) AND (merge_request_id <> NULL::bigint) AND (epic_id IS NULL)) OR ((issue_id IS NULL) AND (merge_request_id IS NULL) AND (epic_id <> NULL::integer))))
 );
 
@@ -19027,6 +19033,8 @@ CREATE INDEX index_dependency_proxy_blobs_on_group_id_and_file_name ON public.de
 
 CREATE INDEX index_dependency_proxy_group_settings_on_group_id ON public.dependency_proxy_group_settings USING btree (group_id);
 
+CREATE INDEX index_deploy_key_id_on_protected_branch_push_access_levels ON public.protected_branch_push_access_levels USING btree (deploy_key_id);
+
 CREATE INDEX index_deploy_keys_projects_on_deploy_key_id ON public.deploy_keys_projects USING btree (deploy_key_id);
 
 CREATE INDEX index_deploy_keys_projects_on_project_id ON public.deploy_keys_projects USING btree (project_id);
@@ -20151,6 +20159,8 @@ CREATE INDEX index_resource_state_events_on_issue_id_and_created_at ON public.re
 
 CREATE INDEX index_resource_state_events_on_merge_request_id ON public.resource_state_events USING btree (merge_request_id);
 
+CREATE INDEX index_resource_state_events_on_source_merge_request_id ON public.resource_state_events USING btree (source_merge_request_id);
+
 CREATE INDEX index_resource_state_events_on_user_id ON public.resource_state_events USING btree (user_id);
 
 CREATE INDEX index_resource_weight_events_on_issue_id_and_created_at ON public.resource_weight_events USING btree (issue_id, created_at);
@@ -20910,6 +20920,9 @@ ALTER TABLE ONLY public.vulnerabilities
 ALTER TABLE ONLY public.vulnerabilities
     ADD CONSTRAINT fk_131d289c65 FOREIGN KEY (milestone_id) REFERENCES public.milestones(id) ON DELETE SET NULL;
 
+ALTER TABLE ONLY public.protected_branch_push_access_levels
+    ADD CONSTRAINT fk_15d2a7a4ae FOREIGN KEY (deploy_key_id) REFERENCES public.keys(id) ON DELETE CASCADE;
+
 ALTER TABLE ONLY public.internal_ids
     ADD CONSTRAINT fk_162941d509 FOREIGN KEY (namespace_id) REFERENCES public.namespaces(id) ON DELETE CASCADE;
 
@@ -22053,6 +22066,9 @@ ALTER TABLE ONLY public.operations_scopes
 ALTER TABLE ONLY public.milestone_releases
     ADD CONSTRAINT fk_rails_7ae0756a2d FOREIGN KEY (milestone_id) REFERENCES public.milestones(id) ON DELETE CASCADE;
 
+ALTER TABLE ONLY public.resource_state_events
+    ADD CONSTRAINT fk_rails_7ddc5f7457 FOREIGN KEY (source_merge_request_id) REFERENCES public.merge_requests(id) ON DELETE SET NULL;
+
 ALTER TABLE ONLY public.application_settings
     ADD CONSTRAINT fk_rails_7e112a9599 FOREIGN KEY (instance_administration_project_id) REFERENCES public.projects(id) ON DELETE SET NULL;
 
@@ -23618,6 +23634,7 @@ COPY "schema_migrations" (version) FROM STDIN;
 20200521225346
 20200522205606
 20200522235146
+20200524104346
 20200525114553
 20200525121014
 20200525144525
@@ -23676,6 +23693,7 @@ COPY "schema_migrations" (version) FROM STDIN;
 20200615111857
 20200615121217
 20200615123055
+20200615141554
 20200615193524
 20200615232735
 20200615234047
@@ -23688,6 +23706,7 @@ COPY "schema_migrations" (version) FROM STDIN;
 20200617001848
 20200617002030
 20200617150041
+20200617205000
 20200618105638
 20200618134223
 20200618134723
@@ -23704,6 +23723,7 @@ COPY "schema_migrations" (version) FROM STDIN;
 20200622235737
 20200623000148
 20200623000320
+20200623073431
 20200623090030
 20200623121135
 20200623141217