Add latest changes from gitlab-org/gitlab@master

2 files changed, 16 insertions, 1 deletions

diff --git a/db/migrate/20200402135250_add_delete_status_to_container_repository.rb b/db/migrate/20200402135250_add_delete_status_to_container_repository.rb
new file mode 100644
index 00000000000..a0dbb307bfc
--- /dev/null
+++ b/db/migrate/20200402135250_add_delete_status_to_container_repository.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class AddDeleteStatusToContainerRepository < ActiveRecord::Migration[6.0]
+  DOWNTIME = false
+
+  def up
+    add_column(:container_repositories, :status, :integer, limit: 2)
+  end
+
+  def down
+    remove_column(:container_repositories, :status)
+  end
+end
diff --git a/db/structure.sql b/db/structure.sql
index ef3319df364..2697dbbe2b1 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -1850,7 +1850,8 @@ CREATE TABLE public.container_repositories (
     project_id integer NOT NULL,
     name character varying NOT NULL,
     created_at timestamp without time zone NOT NULL,
-    updated_at timestamp without time zone NOT NULL
+    updated_at timestamp without time zone NOT NULL,
+    status smallint
 );
 
 CREATE SEQUENCE public.container_repositories_id_seq
@@ -12935,6 +12936,7 @@ COPY "schema_migrations" (version) FROM STDIN;
 20200330123739
 20200330132913
 20200331220930
+20200402135250
 20200403184110
 20200403185127
 20200403185422