diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-20 23:50:22 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-20 23:50:22 +0000 |
commit | 9dc93a4519d9d5d7be48ff274127136236a3adb3 (patch) | |
tree | 70467ae3692a0e35e5ea56bcb803eb512a10bedb /app/views/shared/issue_type/_details_content.html.haml | |
parent | 4b0f34b6d759d6299322b3a54453e930c6121ff0 (diff) | |
download | gitlab-ce-9dc93a4519d9d5d7be48ff274127136236a3adb3.tar.gz |
Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43
Diffstat (limited to 'app/views/shared/issue_type/_details_content.html.haml')
-rw-r--r-- | app/views/shared/issue_type/_details_content.html.haml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/views/shared/issue_type/_details_content.html.haml b/app/views/shared/issue_type/_details_content.html.haml index 7c1ec332ba4..ceedb5e5c59 100644 --- a/app/views/shared/issue_type/_details_content.html.haml +++ b/app/views/shared/issue_type/_details_content.html.haml @@ -1,4 +1,5 @@ - related_branches_path = related_branches_project_issue_path(@project, issuable) +- api_awards_path = local_assigns.fetch(:api_awards_path, nil) .issue-details.issuable-details .detail-page-description.content-block @@ -24,7 +25,7 @@ #related-branches{ data: { url: related_branches_path } } -# This element is filled in using JavaScript. - = render 'shared/issue_type/emoji_block', issuable: issuable + = render 'shared/issue_type/emoji_block', issuable: issuable, api_awards_path: api_awards_path = render 'projects/issues/discussion' |