diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-19 15:57:54 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-19 15:57:54 +0300 |
commit | 419c53ec62de6e97a517abd5fdd4cbde3a942a34 (patch) | |
tree | 1f43a548b46bca8a5fb8fe0c31cef1883d49c5b6 /app/views/projects/issues/_emoji_block.html.haml | |
parent | 1da20d9135b3ad9e75e65b028bffc921aaf8deb7 (diff) |
Add latest changes from gitlab-org/gitlab@16-5-stable-eev16.5.0-rc42
Diffstat (limited to 'app/views/projects/issues/_emoji_block.html.haml')
-rw-r--r-- | app/views/projects/issues/_emoji_block.html.haml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/views/projects/issues/_emoji_block.html.haml b/app/views/projects/issues/_emoji_block.html.haml index 7eb3c0f5c9f..f9eee9ec99e 100644 --- a/app/views/projects/issues/_emoji_block.html.haml +++ b/app/views/projects/issues/_emoji_block.html.haml @@ -1,8 +1,9 @@ - api_awards_path = local_assigns.fetch(:api_awards_path, nil) +- new_custom_emoji_path = local_assigns.fetch(:new_custom_emoji_path, nil) .emoji-block.emoji-block-sticky .row.gl-m-0.gl-justify-content-space-between .js-noteable-awards - = render 'award_emoji/awards_block', awardable: issuable, inline: true, api_awards_path: api_awards_path + = render 'award_emoji/awards_block', awardable: issuable, inline: true, api_awards_path: api_awards_path, new_custom_emoji_path: new_custom_emoji_path .new-branch-col.gl-font-size-0.gl-my-2 = render 'new_branch' if show_new_branch_button? |