diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-06-13 14:36:40 +0100 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-06-13 14:36:40 +0100 |
| commit | 3e11cbebb7bd45678dc8f9a2c5e8c4b9018e8bcb (patch) | |
| tree | cabfdabca18169433d11c127ee82f12e6f918a46 /app/views/award_emoji/_awards_block.html.haml | |
| parent | 75f692748d853d38494ba93ff15f98475b6c2da7 (diff) | |
| parent | 69228d796c26e71da894c18f157c7f95022f0b6b (diff) | |
| download | gitlab-ce-3e11cbebb7bd45678dc8f9a2c5e8c4b9018e8bcb.tar.gz | |
Merge branch 'master' into gl-remove-window-scope
* master:
Add documentation: Overview of Frontend Testing
Resolve "Add `/confidential` quick action for issues"
i18n: externalize strings from 'app/views/award_emoji'
Fix broken tests due to bad conflict resolution
Updates eslint rules
Documentation does not need an exception to be picked
Fix conflicts caused by vue_shared/components/user_avatar/user_avatar_image.vue
[Rails5] Fix `storage_counter` helper
Adjust SQL and transaction Prometheus buckets
Updates eslint vue plugin version
Diffstat (limited to 'app/views/award_emoji/_awards_block.html.haml')
| -rw-r--r-- | app/views/award_emoji/_awards_block.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/award_emoji/_awards_block.html.haml b/app/views/award_emoji/_awards_block.html.haml index 4b3c52af16a..8ca9fb4512e 100644 --- a/app/views/award_emoji/_awards_block.html.haml +++ b/app/views/award_emoji/_awards_block.html.haml @@ -12,9 +12,9 @@ - if can?(current_user, :award_emoji, awardable) .award-menu-holder.js-award-holder %button.btn.award-control.has-tooltip.js-add-award{ type: 'button', - 'aria-label': 'Add reaction', + 'aria-label': _('Add reaction'), class: ("js-user-authored" if user_authored), - data: { title: 'Add reaction', placement: "bottom" } } + data: { title: _('Add reaction'), placement: "bottom" } } %span{ class: "award-control-icon award-control-icon-neutral" }= custom_icon('emoji_slightly_smiling_face') %span{ class: "award-control-icon award-control-icon-positive" }= custom_icon('emoji_smiley') %span{ class: "award-control-icon award-control-icon-super-positive" }= custom_icon('emoji_smile') |