diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-14 00:09:19 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-14 00:09:19 +0300 |
| commit | 42cf1d43320ee62c83de917794b6f99ce4663969 (patch) | |
| tree | e8ed85a628b45912d0275c6a9ce39f5d78971ab6 /app | |
| parent | a90fbe8387aaa8b7603bf5e403311788869d67d5 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/pages/projects/releases/show/index.js | 2 | ||||
| -rw-r--r-- | app/helpers/services_helper.rb | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/app/assets/javascripts/pages/projects/releases/show/index.js b/app/assets/javascripts/pages/projects/releases/show/index.js index 4e17e6ff311..0ec70ef24b6 100644 --- a/app/assets/javascripts/pages/projects/releases/show/index.js +++ b/app/assets/javascripts/pages/projects/releases/show/index.js @@ -1,3 +1,3 @@ import initShowRelease from '~/releases/mount_show'; -document.addEventListener('DOMContentLoaded', initShowRelease); +initShowRelease(); diff --git a/app/helpers/services_helper.rb b/app/helpers/services_helper.rb index 5f361e6653d..14d20e7c622 100644 --- a/app/helpers/services_helper.rb +++ b/app/helpers/services_helper.rb @@ -128,6 +128,13 @@ module ServicesHelper !Gitlab.com? end + def jira_issue_breadcrumb_link(issue_reference) + link_to '', { class: 'gl-display-flex gl-align-items-center gl-white-space-nowrap' } do + icon = image_tag image_path('illustrations/logos/jira.svg'), width: 15, height: 15, class: 'gl-mr-2' + [icon, issue_reference].join.html_safe + end + end + extend self private |