diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-14 18:09:04 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-14 18:09:04 +0300 |
| commit | a3dfd311f4660fc81e929058abd6e136ac884ed3 (patch) | |
| tree | 4d7087cac6e2ca89df3adea98f92b9eddffa7790 /app/views/jira_connect | |
| parent | 7f408a3831590a1f98a1e1a04b63acba8937e36b (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 | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/app/views/jira_connect/subscriptions/index.html.haml b/app/views/jira_connect/subscriptions/index.html.haml index 8ce46a28252..43672551caf 100644 --- a/app/views/jira_connect/subscriptions/index.html.haml +++ b/app/views/jira_connect/subscriptions/index.html.haml @@ -10,7 +10,7 @@ %main.jira-connect-app.gl-px-5.gl-pt-7.gl-mx-auto - if current_user.blank? && @subscriptions.empty? - .jira-connect-app-body.gl-text-center + .jira-connect-app-body.gl-px-5.gl-text-center %h2= s_('JiraService|GitLab for Jira Configuration') %p= s_('JiraService|Sign in to GitLab.com to get started.') @@ -22,26 +22,7 @@ - else .js-jira-connect-app{ data: jira_connect_app_data(@subscriptions) } - .jira-connect-app-body - - if @subscriptions.present? - %table.subscriptions.gl-w-full - %thead - %tr - %th= _('Namespace') - %th= _('Added') - %th - %tbody - - @subscriptions.each do |subscription| - %tr - %td= subscription.namespace.full_path - %td= subscription.created_at - %td= link_to _('Remove'), jira_connect_subscription_path(subscription), class: 'js-jira-connect-remove-subscription' - - else - .gl-text-center - %h4= s_('Integrations|No linked namespaces') - %p= s_('Integrations|Namespaces are the GitLab groups and subgroups you link to this Jira instance.') - - %p.jira-connect-app-body.gl-mt-7.gl-font-base.gl-text-center + %p.jira-connect-app-body.gl-px-5.gl-mt-7.gl-font-base.gl-text-center %strong= s_('Integrations|Browser limitations') - firefox_link_url = 'https://www.mozilla.org/en-US/firefox/' - firefox_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: firefox_link_url } |