Add latest changes from gitlab-org/gitlab@master

3 files changed, 26 insertions, 0 deletions

diff --git a/db/migrate/20210223053451_add_branch_name_to_dast_profile.rb b/db/migrate/20210223053451_add_branch_name_to_dast_profile.rb
new file mode 100644
index 00000000000..311e809103f
--- /dev/null
+++ b/db/migrate/20210223053451_add_branch_name_to_dast_profile.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+class AddBranchNameToDastProfile < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    with_lock_retries do
+      add_column :dast_profiles, :branch_name, :text
+    end
+
+    add_text_limit :dast_profiles, :branch_name, 255
+  end
+
+  def down
+    with_lock_retries do
+      remove_column :dast_profiles, :branch_name
+    end
+  end
+end
diff --git a/db/schema_migrations/20210223053451 b/db/schema_migrations/20210223053451
new file mode 100644
index 00000000000..ad40bb0fa71
--- /dev/null
+++ b/db/schema_migrations/20210223053451
@@ -0,0 +1 @@
+1266bf92f23a42d96778bf546534882f03d2388f22640e4cfaa2a9a1aad19093
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index b829666c1d3..c3b46a15098 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -11634,7 +11634,9 @@ CREATE TABLE dast_profiles (
     updated_at timestamp with time zone NOT NULL,
     name text NOT NULL,
     description text NOT NULL,
+    branch_name text,
     CONSTRAINT check_5fcf73bf61 CHECK ((char_length(name) <= 255)),
+    CONSTRAINT check_6c9d775949 CHECK ((char_length(branch_name) <= 255)),
     CONSTRAINT check_c34e505c24 CHECK ((char_length(description) <= 255))
 );