diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-09 15:12:03 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-09 15:12:03 +0300 |
| commit | 704ed7ea397fbcd02c9b9724cf03e4d4949183fb (patch) | |
| tree | 115443f45f100879180b5651a6bf3e062cccfe24 /app/views | |
| parent | 6021fa2fc624b7d6902273bae55c5b8b2b2b3fff (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/help/drawers.html.haml | 2 | ||||
| -rw-r--r-- | app/views/jira_connect/subscriptions/index.html.haml | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/views/help/drawers.html.haml b/app/views/help/drawers.html.haml new file mode 100644 index 00000000000..7c173eb7b07 --- /dev/null +++ b/app/views/help/drawers.html.haml @@ -0,0 +1,2 @@ += cache(@clean_path, expires_in: 1.day) do + = markdown get_markdown_without_frontmatter(@path) diff --git a/app/views/jira_connect/subscriptions/index.html.haml b/app/views/jira_connect/subscriptions/index.html.haml index d4ced15b869..f66aa0840aa 100644 --- a/app/views/jira_connect/subscriptions/index.html.haml +++ b/app/views/jira_connect/subscriptions/index.html.haml @@ -1,4 +1,4 @@ -.js-jira-connect-app{ data: jira_connect_app_data(@subscriptions) } +.js-jira-connect-app{ data: jira_connect_app_data(@subscriptions, @current_jira_installation) } = webpack_bundle_tag 'performance_bar' if performance_bar_enabled? = webpack_bundle_tag 'jira_connect_app' |