Skip to content
代码片段 群组 项目
提交 d5bddfbc 编辑于 作者: Justin Ho Tuan Duong's avatar Justin Ho Tuan Duong
浏览文件

Revert "Merge branch..."

This reverts merge request !126110
上级 4506c996
No related branches found
No related tags found
无相关合并请求
......@@ -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" />
......
......@@ -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,
......
......@@ -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."
......@@ -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[]')
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册