Add latest changes from gitlab-org/gitlab@master

10 files changed, 49 insertions, 3 deletions

diff --git a/changelogs/unreleased/325280-add-instance_url-to-jira_connect_installations.yml b/changelogs/unreleased/325280-add-instance_url-to-jira_connect_installations.yml
new file mode 100644
index 00000000000..be00e663cb8
--- /dev/null
+++ b/changelogs/unreleased/325280-add-instance_url-to-jira_connect_installations.yml
@@ -0,0 +1,5 @@
+---
+title: Add instance_url column to the jira_connect_installations table
+merge_request: 59148
+author:
+type: added
diff --git a/db/migrate/20210412132736_add_instance_url_to_jira_connect_installations.rb b/db/migrate/20210412132736_add_instance_url_to_jira_connect_installations.rb
new file mode 100644
index 00000000000..78b5e7d5d35
--- /dev/null
+++ b/db/migrate/20210412132736_add_instance_url_to_jira_connect_installations.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class AddInstanceUrlToJiraConnectInstallations < ActiveRecord::Migration[6.0]
+  DOWNTIME = false
+
+  # rubocop:disable Migration/AddLimitToTextColumns
+  # limit is added in db/migrate/20210216163811_add_text_limit_to_jira_connect_installations_instance_url.rb
+  def up
+    add_column :jira_connect_installations, :instance_url, :text
+  end
+  # rubocop:enable Migration/AddLimitToTextColumns
+
+  def down
+    remove_column :jira_connect_installations, :instance_url
+  end
+end
diff --git a/db/migrate/20210412132824_add_text_limit_to_jira_connect_installations_instance_url.rb b/db/migrate/20210412132824_add_text_limit_to_jira_connect_installations_instance_url.rb
new file mode 100644
index 00000000000..22c82ccd223
--- /dev/null
+++ b/db/migrate/20210412132824_add_text_limit_to_jira_connect_installations_instance_url.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class AddTextLimitToJiraConnectInstallationsInstanceUrl < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    add_text_limit :jira_connect_installations, :instance_url, 255
+  end
+
+  def down
+    remove_text_limit :jira_connect_installations, :instance_url
+  end
+end
diff --git a/db/schema_migrations/20210412132736 b/db/schema_migrations/20210412132736
new file mode 100644
index 00000000000..23cadad52aa
--- /dev/null
+++ b/db/schema_migrations/20210412132736
@@ -0,0 +1 @@
+fa3287ed845c2fa24c3c65825362b4393433e273a3e94ed454ef5cc3b373d8a3
\ No newline at end of file
diff --git a/db/schema_migrations/20210412132824 b/db/schema_migrations/20210412132824
new file mode 100644
index 00000000000..3c5d9b79115
--- /dev/null
+++ b/db/schema_migrations/20210412132824
@@ -0,0 +1 @@
+cb02cb38d6f050ac49ac2c963307da4543590cc5ebd50fbc2225c519f1c96849
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index 710a112d521..2d4b0d96fd7 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -13869,7 +13869,9 @@ CREATE TABLE jira_connect_installations (
     client_key character varying,
     encrypted_shared_secret character varying,
     encrypted_shared_secret_iv character varying,
-    base_url character varying
+    base_url character varying,
+    instance_url text,
+    CONSTRAINT check_4c6abed669 CHECK ((char_length(instance_url) <= 255))
 );
 
 CREATE SEQUENCE jira_connect_installations_id_seq
diff --git a/doc/user/project/merge_requests/code_quality.md b/doc/user/project/merge_requests/code_quality.md
index b4b9e91dd94..0fe1b9801cc 100644
--- a/doc/user/project/merge_requests/code_quality.md
+++ b/doc/user/project/merge_requests/code_quality.md
@@ -33,7 +33,7 @@ Code Quality:
 Going a step further, GitLab can show the Code Quality report right
 in the merge request widget area if a report from the target branch is available to compare to:
 
-![Code Quality Widget](img/code_quality.png)
+![Code Quality Widget](img/code_quality_widget_13_11.png)
 
 Watch a quick walkthrough of Code Quality in action:
 
@@ -366,7 +366,11 @@ NOTE:
 Although the Code Climate spec supports more properties, those are ignored by
 GitLab.
 
-## Code Quality reports
+## Code Quality reports **(PREMIUM)**
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/21527) in GitLab Premium 12.9.
+
+![Code Quality Report](img/code_quality_report_13_11.png)
 
 After the Code Quality job completes:
 
diff --git a/doc/user/project/merge_requests/img/code_quality.png b/doc/user/project/merge_requests/img/code_quality.png
deleted file mode 100644
index 1e7dd64baff..00000000000
--- a/doc/user/project/merge_requests/img/code_quality.png
+++ /dev/null
diff --git a/doc/user/project/merge_requests/img/code_quality_report_13_11.png b/doc/user/project/merge_requests/img/code_quality_report_13_11.png
new file mode 100644
index 00000000000..36341548328
--- /dev/null
+++ b/doc/user/project/merge_requests/img/code_quality_report_13_11.png
diff --git a/doc/user/project/merge_requests/img/code_quality_widget_13_11.png b/doc/user/project/merge_requests/img/code_quality_widget_13_11.png
new file mode 100644
index 00000000000..57978a0ed96
--- /dev/null
+++ b/doc/user/project/merge_requests/img/code_quality_widget_13_11.png