diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-05 15:10:36 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-05 15:10:36 +0300 |
| commit | 797182cd82922765fe79a13bc0ed6bd5672d4283 (patch) | |
| tree | 82d0ea1a8378560de4aeb5c1e446b74282035d60 /app/views/jira_connect | |
| parent | a060caf3db3090d75284a71a08ab1cf697afad97 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/jira_connect')
| -rw-r--r-- | app/views/jira_connect/subscriptions/index.html.haml | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/app/views/jira_connect/subscriptions/index.html.haml b/app/views/jira_connect/subscriptions/index.html.haml index b826a1b6fc6..90a92f5c6d5 100644 --- a/app/views/jira_connect/subscriptions/index.html.haml +++ b/app/views/jira_connect/subscriptions/index.html.haml @@ -23,15 +23,16 @@ - else .js-jira-connect-app - %form#add-subscription-form.subscription-form{ action: jira_connect_subscriptions_path } - .ak-field-group - %label - GitLab namespace + - unless new_jira_connect_ui? + %form#add-subscription-form.subscription-form{ action: jira_connect_subscriptions_path } + .ak-field-group + %label + GitLab namespace - .ak-field-group.field-group-input - %input#namespace-input.ak-field-text{ type: 'text', required: true, placeholder: 'e.g. "MyCompany" or "MyCompany/GroupName"' } - %button.ak-button.ak-button__appearance-primary{ type: 'submit' } - Link namespace to Jira + .ak-field-group.field-group-input + %input#namespace-input.ak-field-text{ type: 'text', required: true, placeholder: 'e.g. "MyCompany" or "MyCompany/GroupName"' } + %button.ak-button.ak-button__appearance-primary{ type: 'submit' } + Link namespace to Jira - if @subscriptions.present? %table.subscriptions @@ -49,6 +50,7 @@ - else %h4.empty-subscriptions No linked namespaces + %p= s_('Integrations|Namespaces are your GitLab groups and subgroups that will be linked to this Jira instance.') %p.browser-limitations-notice %strong Browser limitations: |