Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-02-24 12:11:09 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-02-24 12:11:09 +0300
commit91e247b531c89342faed387c0d312622eb8a9c93 (patch)
treea9230928f5b0e789771022018893f36becbb01c9 /app/views/jira_connect
parentea8c11261522bda899f8b5e5ac61a6324e2904ba (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.haml13
1 files changed, 1 insertions, 12 deletions
diff --git a/app/views/jira_connect/subscriptions/index.html.haml b/app/views/jira_connect/subscriptions/index.html.haml
index 6a549227185..c7873991010 100644
--- a/app/views/jira_connect/subscriptions/index.html.haml
+++ b/app/views/jira_connect/subscriptions/index.html.haml
@@ -15,8 +15,7 @@
%p= s_('JiraService|Sign in to GitLab.com to get started.')
.gl-mt-7
- - sign_in_button_class = new_jira_connect_ui? ? 'btn gl-button btn-confirm' : 'ak-button ak-button__appearance-primary'
- = external_link _('Sign in to GitLab'), jira_connect_users_path, class: "#{sign_in_button_class} js-jira-connect-sign-in"
+ = external_link _('Sign in to GitLab'), jira_connect_users_path, class: "btn gl-button btn-confirm js-jira-connect-sign-in"
.gl-mt-7
%p= s_('Integrations|Note: this integration only works with accounts on GitLab.com (SaaS).')
@@ -24,16 +23,6 @@
.js-jira-connect-app{ data: jira_connect_app_data(@subscriptions) }
.jira-connect-app-body
- - unless new_jira_connect_ui?
- %form#add-subscription-form.subscription-form.gl-mb-5{ 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' }
- = s_('Integrations|Link namespace to Jira')
-
- if @subscriptions.present?
%table.subscriptions.gl-w-full
%thead