Add latest changes from gitlab-org/gitlab@master

5 files changed, 38 insertions, 7 deletions

diff --git a/app/assets/javascripts/clone_panel.js b/app/assets/javascripts/clone_panel.js
index ec831a77bde..79280c13f0f 100644
--- a/app/assets/javascripts/clone_panel.js
+++ b/app/assets/javascripts/clone_panel.js
@@ -17,7 +17,12 @@ export default function initClonePanel() {
     $('a', $cloneOptions).on('click', (e) => {
       const $this = $(e.currentTarget);
       const url = $this.attr('href');
-      if (url && (url.startsWith('vscode://') || url.startsWith('xcode://'))) {
+      if (
+        url &&
+        (url.startsWith('vscode://') ||
+          url.startsWith('xcode://') ||
+          url.startsWith('jetbrains://'))
+      ) {
         // Clone with "..." should open like a normal link
         return;
       }
diff --git a/app/views/projects/buttons/_clone.html.haml b/app/views/projects/buttons/_clone.html.haml
index 74d10f11898..5fd1c5cd403 100644
--- a/app/views/projects/buttons/_clone.html.haml
+++ b/app/views/projects/buttons/_clone.html.haml
@@ -30,13 +30,23 @@
       %label.label-bold{ class: 'gl-px-4!' }
         = _('Open in your IDE')
       - if ssh_enabled?
-        %a.dropdown-item.open-with-link{ href: 'vscode://vscode.git/clone?url=' + CGI.escape(project.ssh_url_to_repo) }
+        - escaped_ssh_url_to_repo = CGI.escape(project.ssh_url_to_repo)
+        %a.dropdown-item.open-with-link{ href: 'vscode://vscode.git/clone?url=' + escaped_ssh_url_to_repo }
           .gl-new-dropdown-item-text-wrapper
             = _('Visual Studio Code (SSH)')
       - if http_enabled?
-        %a.dropdown-item.open-with-link{ href: 'vscode://vscode.git/clone?url=' + CGI.escape(project.http_url_to_repo) }
+        - escaped_http_url_to_repo = CGI.escape(project.http_url_to_repo)
+        %a.dropdown-item.open-with-link{ href: 'vscode://vscode.git/clone?url=' + escaped_http_url_to_repo }
           .gl-new-dropdown-item-text-wrapper
             = _('Visual Studio Code (HTTPS)')
+      - if ssh_enabled?
+        %a.dropdown-item.open-with-link{ href: 'jetbrains://idea/checkout/git?idea.required.plugins.id=Git4Idea&checkout.repo=' + escaped_ssh_url_to_repo }
+          .gl-new-dropdown-item-text-wrapper
+            = _('IntelliJ IDEA (SSH)')
+      - if http_enabled?
+        %a.dropdown-item.open-with-link{ href: 'jetbrains://idea/checkout/git?idea.required.plugins.id=Git4Idea&checkout.repo=' + escaped_http_url_to_repo }
+          .gl-new-dropdown-item-text-wrapper
+            = _('IntelliJ IDEA (HTTPS)')
       - if show_xcode_link?(@project)
         %a.dropdown-item.open-with-link{ href: xcode_uri_to_repo(@project) }
           .gl-new-dropdown-item-text-wrapper
diff --git a/doc/administration/gitaly/praefect.md b/doc/administration/gitaly/praefect.md
index b3f4e511c50..866488f2c56 100644
--- a/doc/administration/gitaly/praefect.md
+++ b/doc/administration/gitaly/praefect.md
@@ -338,6 +338,13 @@ pgbouncer['databases'] = {
 
   ...
 }
+
+# Allow the praefect user to connect to PgBouncer
+pgbouncer['users'] = {
+  'praefect': {
+    'password': PRAEFECT_SQL_PASSWORD_HASH,
+  }
+}
 ```
 
 Both `praefect_production` and `praefect_production_direct` use the same database endpoint
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index ea53d7d5f9e..dd0d50c4153 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -6164,6 +6164,9 @@ msgstr ""
 msgid "BoardScope|Current iteration"
 msgstr ""
 
+msgid "BoardScope|Don't filter milestone"
+msgstr ""
+
 msgid "BoardScope|Edit"
 msgstr ""
 
@@ -20837,6 +20840,12 @@ msgstr ""
 msgid "Integrations|can't exceed %{recipients_limit}"
 msgstr ""
 
+msgid "IntelliJ IDEA (HTTPS)"
+msgstr ""
+
+msgid "IntelliJ IDEA (SSH)"
+msgstr ""
+
 msgid "Interactive mode"
 msgstr ""
 
@@ -25728,9 +25737,6 @@ msgstr ""
 msgid "No matching results..."
 msgstr ""
 
-msgid "No member provided"
-msgstr ""
-
 msgid "No members found"
 msgstr ""
 
@@ -43389,6 +43395,9 @@ msgstr ""
 msgid "You can only add up to %{max_contacts} contacts at one time"
 msgstr ""
 
+msgid "You can only approve an indivdual user, member, or all members"
+msgstr ""
+
 msgid "You can only edit files when you are on a branch"
 msgstr ""
 
diff --git a/qa/lib/gitlab/page/group/settings/usage_quotas.rb b/qa/lib/gitlab/page/group/settings/usage_quotas.rb
index 0408668a81c..df12fe4076c 100644
--- a/qa/lib/gitlab/page/group/settings/usage_quotas.rb
+++ b/qa/lib/gitlab/page/group/settings/usage_quotas.rb
@@ -14,7 +14,7 @@ module Gitlab
           span :purchased_usage_total
           div :ci_purchase_successful_alert, text: /You have successfully purchased CI minutes/
           div :storage_purchase_successful_alert, text: /You have successfully purchased a storage/
-          h4 :storage_available_alert, text: /purchased storage is available/
+          h2 :storage_available_alert, text: /purchased storage is available/
 
           def plan_ci_limits
             plan_ci_minutes_element.span.text[%r{([^/ ]+)$}]