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>2020-11-05 21:08:48 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-11-05 21:08:48 +0300
commit3e1c760141a27097d74d191a619fa6edecd86fe7 (patch)
treedc26e1842b355d2ebad6c8923077b0a016aa82c9 /app/views/jira_connect
parent74dd67ddea70f70830f3fe1ca65b06b604ec229f (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.haml5
1 files changed, 5 insertions, 0 deletions
diff --git a/app/views/jira_connect/subscriptions/index.html.haml b/app/views/jira_connect/subscriptions/index.html.haml
index 655c413f2a6..5156472d203 100644
--- a/app/views/jira_connect/subscriptions/index.html.haml
+++ b/app/views/jira_connect/subscriptions/index.html.haml
@@ -21,6 +21,8 @@
.gl-mt-5
%p Note: this integration only works with accounts on GitLab.com (SaaS).
- else
+ .js-jira-connect-app
+
%form#add-subscription-form.subscription-form{ action: jira_connect_subscriptions_path }
.ak-field-group
%label
@@ -57,5 +59,8 @@
or enable cross-site cookies in your browser when adding a namespace.
%a{ href: 'https://gitlab.com/gitlab-org/gitlab/-/issues/263509', target: '_blank', rel: 'noopener noreferrer' } Learn more
+= webpack_bundle_tag 'performance_bar' if performance_bar_enabled?
+= webpack_bundle_tag 'jira_connect_app'
+
= page_specific_javascript_tag('jira_connect.js')
- add_page_specific_style 'page_bundles/jira_connect'