Add latest changes from gitlab-org/gitlab@master

3 files changed, 64 insertions, 0 deletions

diff --git a/db/migrate/20201103045515_add_issuable_metric_images.rb b/db/migrate/20201103045515_add_issuable_metric_images.rb
new file mode 100644
index 00000000000..c598bb468a1
--- /dev/null
+++ b/db/migrate/20201103045515_add_issuable_metric_images.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+class AddIssuableMetricImages < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    unless table_exists?(:issuable_metric_images)
+      with_lock_retries do
+        create_table :issuable_metric_images do |t|
+          t.references :issue, null: false, index: true, foreign_key: { on_delete: :cascade }
+          t.timestamps_with_timezone
+          t.integer :file_store, limit: 2
+          t.text :file, null: false
+          t.text :url
+        end
+      end
+    end
+
+    add_text_limit(:issuable_metric_images, :url, 255)
+    add_text_limit(:issuable_metric_images, :file, 255)
+  end
+
+  def down
+    with_lock_retries do
+      drop_table :issuable_metric_images
+    end
+  end
+end
diff --git a/db/schema_migrations/20201103045515 b/db/schema_migrations/20201103045515
new file mode 100644
index 00000000000..31b56acb147
--- /dev/null
+++ b/db/schema_migrations/20201103045515
@@ -0,0 +1 @@
+0172b71564e3d3e30c543890a4672b5a118f8053324b177fbbd9e83357ddf3a8
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index 3887be372d5..98183be2dd4 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -12926,6 +12926,27 @@ CREATE SEQUENCE ip_restrictions_id_seq
 
 ALTER SEQUENCE ip_restrictions_id_seq OWNED BY ip_restrictions.id;
 
+CREATE TABLE issuable_metric_images (
+    id bigint NOT NULL,
+    issue_id bigint NOT NULL,
+    created_at timestamp with time zone NOT NULL,
+    updated_at timestamp with time zone NOT NULL,
+    file_store smallint,
+    file text NOT NULL,
+    url text,
+    CONSTRAINT check_5b3011e234 CHECK ((char_length(url) <= 255)),
+    CONSTRAINT check_7ed527062f CHECK ((char_length(file) <= 255))
+);
+
+CREATE SEQUENCE issuable_metric_images_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+ALTER SEQUENCE issuable_metric_images_id_seq OWNED BY issuable_metric_images.id;
+
 CREATE TABLE issuable_severities (
     id bigint NOT NULL,
     issue_id bigint NOT NULL,
@@ -17999,6 +18020,8 @@ ALTER TABLE ONLY internal_ids ALTER COLUMN id SET DEFAULT nextval('internal_ids_
 
 ALTER TABLE ONLY ip_restrictions ALTER COLUMN id SET DEFAULT nextval('ip_restrictions_id_seq'::regclass);
 
+ALTER TABLE ONLY issuable_metric_images ALTER COLUMN id SET DEFAULT nextval('issuable_metric_images_id_seq'::regclass);
+
 ALTER TABLE ONLY issuable_severities ALTER COLUMN id SET DEFAULT nextval('issuable_severities_id_seq'::regclass);
 
 ALTER TABLE ONLY issuable_slas ALTER COLUMN id SET DEFAULT nextval('issuable_slas_id_seq'::regclass);
@@ -19183,6 +19206,9 @@ ALTER TABLE ONLY internal_ids
 ALTER TABLE ONLY ip_restrictions
     ADD CONSTRAINT ip_restrictions_pkey PRIMARY KEY (id);
 
+ALTER TABLE ONLY issuable_metric_images
+    ADD CONSTRAINT issuable_metric_images_pkey PRIMARY KEY (id);
+
 ALTER TABLE ONLY issuable_severities
     ADD CONSTRAINT issuable_severities_pkey PRIMARY KEY (id);
 
@@ -21077,6 +21103,8 @@ CREATE UNIQUE INDEX index_internal_ids_on_usage_and_project_id ON internal_ids U
 
 CREATE INDEX index_ip_restrictions_on_group_id ON ip_restrictions USING btree (group_id);
 
+CREATE INDEX index_issuable_metric_images_on_issue_id ON issuable_metric_images USING btree (issue_id);
+
 CREATE UNIQUE INDEX index_issuable_severities_on_issue_id ON issuable_severities USING btree (issue_id);
 
 CREATE UNIQUE INDEX index_issuable_slas_on_issue_id ON issuable_slas USING btree (issue_id);
@@ -23838,6 +23866,9 @@ ALTER TABLE ONLY clusters_applications_knative
 ALTER TABLE ONLY terraform_states
     ADD CONSTRAINT fk_rails_558901b030 FOREIGN KEY (locked_by_user_id) REFERENCES users(id);
 
+ALTER TABLE ONLY issuable_metric_images
+    ADD CONSTRAINT fk_rails_56417a5a7f FOREIGN KEY (issue_id) REFERENCES issues(id) ON DELETE CASCADE;
+
 ALTER TABLE ONLY group_deploy_keys
     ADD CONSTRAINT fk_rails_5682fc07f8 FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE RESTRICT;