From d5bddfbc204d3014c89c73d378a58a369c340142 Mon Sep 17 00:00:00 2001
From: Justin Ho Tuan Duong <hduong@gitlab.com>
Date: Fri, 14 Jul 2023 06:39:31 +0000
Subject: [PATCH] Revert "Merge branch..."
This reverts merge request !126110
---
.../components/add_namespace_modal/groups_list.vue | 6 +++++-
app/helpers/jira_connect_helper.rb | 2 +-
locale/gitlab.pot | 2 +-
spec/helpers/jira_connect_helper_spec.rb | 4 ----
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/app/assets/javascripts/jira_connect/subscriptions/components/add_namespace_modal/groups_list.vue b/app/assets/javascripts/jira_connect/subscriptions/components/add_namespace_modal/groups_list.vue
index ffbfc1c31eb1d..3d02dcb1198ac 100644
--- a/app/assets/javascripts/jira_connect/subscriptions/components/add_namespace_modal/groups_list.vue
+++ b/app/assets/javascripts/jira_connect/subscriptions/components/add_namespace_modal/groups_list.vue
@@ -111,7 +111,11 @@ export default {
/>
<p class="gl-mb-3">
- {{ s__('JiraConnect|Not seeing your groups? Only groups you have access to appear here.') }}
+ {{
+ s__(
+ 'JiraConnect|Not seeing your groups? Only groups you have at least the Maintainer role for appear here.',
+ )
+ }}
</p>
<gl-loading-icon v-if="isLoadingInitial" size="lg" />
diff --git a/app/helpers/jira_connect_helper.rb b/app/helpers/jira_connect_helper.rb
index 022b9a0fc28a6..5cf68db0611ba 100644
--- a/app/helpers/jira_connect_helper.rb
+++ b/app/helpers/jira_connect_helper.rb
@@ -5,7 +5,7 @@ def jira_connect_app_data(subscriptions, installation)
skip_groups = subscriptions.map(&:namespace_id)
{
- groups_path: api_v4_groups_path(params: { all_available: true, skip_groups: skip_groups }),
+ groups_path: api_v4_groups_path(params: { min_access_level: Gitlab::Access::MAINTAINER, skip_groups: skip_groups }),
subscriptions: subscriptions.map { |s| serialize_subscription(s) }.to_json,
subscriptions_path: jira_connect_subscriptions_path(format: :json),
gitlab_user_path: current_user ? user_path(current_user) : nil,
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index a86fbdeb8110f..c4d33e39a10a7 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -25882,7 +25882,7 @@ msgstr ""
msgid "JiraConnect|No linked groups"
msgstr ""
-msgid "JiraConnect|Not seeing your groups? Only groups you have access to appear here."
+msgid "JiraConnect|Not seeing your groups? Only groups you have at least the Maintainer role for appear here."
msgstr ""
msgid "JiraConnect|Setting up this integration is only possible if you're a GitLab administrator."
diff --git a/spec/helpers/jira_connect_helper_spec.rb b/spec/helpers/jira_connect_helper_spec.rb
index 0e32f6f20804e..b7c25320a0e4e 100644
--- a/spec/helpers/jira_connect_helper_spec.rb
+++ b/spec/helpers/jira_connect_helper_spec.rb
@@ -75,10 +75,6 @@
end
end
- it 'passes "all_available" param to groups_path' do
- expect(subject[:groups_path]).to include('all_available=true')
- end
-
it 'passes group as "skip_groups" param' do
skip_groups_param = CGI.escape('skip_groups[]')
--
GitLab