diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-04 18:08:35 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-04 18:08:35 +0000 |
| commit | e15501a5e1f54249434167c0198dab775bdc4a1f (patch) | |
| tree | 15615908225f23633fa269c063de38d38f88c38a /app/helpers | |
| parent | 856e2c64ee69b055b31a8ebbeee616f13a46505e (diff) | |
| download | gitlab-ce-e15501a5e1f54249434167c0198dab775bdc4a1f.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/jira_connect_helper.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/helpers/jira_connect_helper.rb b/app/helpers/jira_connect_helper.rb index 67b85b26f9e..30f29e002b8 100644 --- a/app/helpers/jira_connect_helper.rb +++ b/app/helpers/jira_connect_helper.rb @@ -7,7 +7,8 @@ module JiraConnectHelper { 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, + add_subscriptions_path: jira_connect_subscriptions_path, + subscriptions_path: jira_connect_subscriptions_path(format: :json), users_path: current_user ? nil : jira_connect_users_path, # users_path is used to determine if user is signed in gitlab_user_path: current_user ? user_path(current_user) : nil, oauth_metadata: Feature.enabled?(:jira_connect_oauth, current_user) ? jira_connect_oauth_data.to_json : nil |