Add latest changes from gitlab-org/gitlab@master

3 files changed, 25 insertions, 0 deletions

diff --git a/db/migrate/20210119153801_add_proxy_settings_to_jira_tracker_data.rb b/db/migrate/20210119153801_add_proxy_settings_to_jira_tracker_data.rb
new file mode 100644
index 00000000000..237ea25554d
--- /dev/null
+++ b/db/migrate/20210119153801_add_proxy_settings_to_jira_tracker_data.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class AddProxySettingsToJiraTrackerData < ActiveRecord::Migration[6.0]
+  DOWNTIME = false
+
+  def change
+    add_column :jira_tracker_data, :encrypted_proxy_address, :text
+    add_column :jira_tracker_data, :encrypted_proxy_address_iv, :text
+    add_column :jira_tracker_data, :encrypted_proxy_port, :text
+    add_column :jira_tracker_data, :encrypted_proxy_port_iv, :text
+    add_column :jira_tracker_data, :encrypted_proxy_username, :text
+    add_column :jira_tracker_data, :encrypted_proxy_username_iv, :text
+    add_column :jira_tracker_data, :encrypted_proxy_password, :text
+    add_column :jira_tracker_data, :encrypted_proxy_password_iv, :text
+  end
+end
diff --git a/db/schema_migrations/20210119153801 b/db/schema_migrations/20210119153801
new file mode 100644
index 00000000000..f84f7ad1d48
--- /dev/null
+++ b/db/schema_migrations/20210119153801
@@ -0,0 +1 @@
+c8b5485f158fdec0ab6813e4014713786dfa231b901e77ea610a873d03f8f0f0
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index 16abc737975..e9628af9a0d 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -13602,6 +13602,14 @@ CREATE TABLE jira_tracker_data (
     deployment_type smallint DEFAULT 0 NOT NULL,
     vulnerabilities_issuetype text,
     vulnerabilities_enabled boolean DEFAULT false NOT NULL,
+    encrypted_proxy_address text,
+    encrypted_proxy_address_iv text,
+    encrypted_proxy_port text,
+    encrypted_proxy_port_iv text,
+    encrypted_proxy_username text,
+    encrypted_proxy_username_iv text,
+    encrypted_proxy_password text,
+    encrypted_proxy_password_iv text,
     CONSTRAINT check_0bf84b76e9 CHECK ((char_length(vulnerabilities_issuetype) <= 255)),
     CONSTRAINT check_214cf6a48b CHECK ((char_length(project_key) <= 255))
 );