Add latest changes from gitlab-org/gitlab@master

2 files changed, 22 insertions, 1 deletions

diff --git a/db/migrate/20200604001128_add_secrets_to_ci_builds_metadata.rb b/db/migrate/20200604001128_add_secrets_to_ci_builds_metadata.rb
new file mode 100644
index 00000000000..9a67993cf5c
--- /dev/null
+++ b/db/migrate/20200604001128_add_secrets_to_ci_builds_metadata.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class AddSecretsToCiBuildsMetadata < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  def up
+    with_lock_retries do
+      add_column :ci_builds_metadata, :secrets, :jsonb, default: {}, null: false
+    end
+  end
+
+  def down
+    with_lock_retries do
+      remove_column :ci_builds_metadata, :secrets
+    end
+  end
+end
diff --git a/db/structure.sql b/db/structure.sql
index 42fcfe0ef9a..1be04406542 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -1075,7 +1075,8 @@ CREATE TABLE public.ci_builds_metadata (
     config_variables jsonb,
     has_exposed_artifacts boolean,
     environment_auto_stop_in character varying(255),
-    expanded_environment_name character varying(255)
+    expanded_environment_name character varying(255),
+    secrets jsonb DEFAULT '{}'::jsonb NOT NULL
 );
 
 CREATE SEQUENCE public.ci_builds_metadata_id_seq
@@ -14047,6 +14048,7 @@ COPY "schema_migrations" (version) FROM STDIN;
 20200602143020
 20200603073101
 20200603180338
+20200604001128
 20200604143628
 20200604145731
 20200604174544