diff options
author | Rémy Coutable <remy@rymai.me> | 2017-03-16 11:03:35 +0100 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2017-03-16 12:24:41 +0100 |
commit | 6c2a5b565da1f2332e792be31827ca658d8e897a (patch) | |
tree | 5efbec51c57e238ac0eb9927f91e27bffd1610ff | |
parent | 3255239b1d183712a821a7243934dd38322ac777 (diff) | |
download | gitlab-ce-29529-quick-fix.tar.gz |
This quick-fixes an issue with existing award emoji not being valid anymore29529-quick-fix
This returns an empty string instead of raising a 500 error.
Signed-off-by: Rémy Coutable <remy@rymai.me>
-rw-r--r-- | lib/gitlab/emoji.rb | 17 | ||||
-rw-r--r-- | spec/features/issues/award_emoji_spec.rb | 14 |
2 files changed, 17 insertions, 14 deletions
diff --git a/lib/gitlab/emoji.rb b/lib/gitlab/emoji.rb index 35871fd1b7b..9908f9b492c 100644 --- a/lib/gitlab/emoji.rb +++ b/lib/gitlab/emoji.rb @@ -44,26 +44,17 @@ module Gitlab end # CSS sprite fallback takes precedence over image fallback - def gl_emoji_tag(name, image: false, sprite: false, force_fallback: false) + def gl_emoji_tag(name) emoji_name = emojis_aliases[name] || name emoji_info = emojis[emoji_name] - emoji_fallback_image_source = ActionController::Base.helpers.url_to_image("emoji/#{emoji_info['name']}.png") - emoji_fallback_sprite_class = "emoji-#{emoji_name}" + return unless emoji_info data = { name: emoji_name, unicode_version: emoji_unicode_version(emoji_name) } - data[:fallback_src] = emoji_fallback_image_source if image - data[:fallback_sprite_class] = emoji_fallback_sprite_class if sprite - ActionController::Base.helpers.content_tag 'gl-emoji', - class: ("emoji-icon #{emoji_fallback_sprite_class}" if force_fallback && sprite), - data: data do - if force_fallback && !sprite - emoji_image_tag(emoji_name, emoji_fallback_image_source) - else - emoji_info['moji'] - end + ActionController::Base.helpers.content_tag 'gl-emoji', data: data do + emoji_info['moji'] end end end diff --git a/spec/features/issues/award_emoji_spec.rb b/spec/features/issues/award_emoji_spec.rb index f424186cf30..b7d326822f2 100644 --- a/spec/features/issues/award_emoji_spec.rb +++ b/spec/features/issues/award_emoji_spec.rb @@ -17,8 +17,20 @@ describe 'Awards Emoji', feature: true do login_as(user) end + describe 'Visit an issue with a legacy award emoji that is not valid anymore' do + before do + # The `heart_tip` emoji is not valid anymore so we need to skip validation + issue.award_emoji.build(user: user, name: 'heart_tip').save!(validate: false) + visit namespace_project_issue_path(project.namespace, project, issue) + end + + it 'increments the thumbsdown emoji' do + expect(page).to have_text(issue.title) + end + end + describe 'Click award emoji from issue#show' do - let!(:note) { create(:note_on_issue, noteable: issue, project: issue.project, note: "Hello world") } + let!(:note) { create(:note_on_issue, noteable: issue, project: issue.project, note: "Hello world") } before do visit namespace_project_issue_path(project.namespace, project, issue) |