Download as
Browse Code »

Commit 5f595be4b80ae57c92d01dc1c0026566f80e67d4

Authored by Marin Jankovski
1 parent 817f5ff6
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Use new gems methods.

Showing 4 changed files with 3 additions and 6 deletions   Show diff stats
app/views/layouts/_init_auto_complete.html.haml
  Diff comments   View file @5f595be
1 :javascript 1 :javascript
2 GitLab.GfmAutoComplete.dataSource = "#{autocomplete_sources_project_path(@project)}" 2 GitLab.GfmAutoComplete.dataSource = "#{autocomplete_sources_project_path(@project)}"
3 - GitLab.GfmAutoComplete.Emoji.assetBase = "#{Gitlab.config.gitlab.relative_url_root + '/assets/emoji'}" 3 + GitLab.GfmAutoComplete.Emoji.assetBase = "#{Gitlab.config.gitlab.relative_url_root + Emoji.asset_path}"
4 GitLab.GfmAutoComplete.setup(); 4 GitLab.GfmAutoComplete.setup();
app/views/projects/notes/_note.html.haml
  Diff comments   View file @5f595be
@@ -23,7 +23,7 @@ @@ -23,7 +23,7 @@
23 %i.icon-thumbs-up 23 %i.icon-thumbs-up
24 \+1 24 \+1
25 - if note.downvote? 25 - if note.downvote?
26 - %span.vote.downvote.label.label-error 26 + %span.vote.downvote.label.label-danger
27 %i.icon-thumbs-down 27 %i.icon-thumbs-down
28 \-1 28 \-1
29 29
config/initializers/gemoji.rb
View file @817f5ff
@@ -1,3 +0,0 @@ @@ -1,3 +0,0 @@
1 -# Workaround for https://github.com/github/gemoji/pull/18  
2 -require 'gemoji'  
3 -Gitlab::Application.config.assets.paths << Emoji.images_path  
lib/gitlab/markdown.rb
  Diff comments   View file @5f595be
@@ -152,7 +152,7 @@ module Gitlab @@ -152,7 +152,7 @@ module Gitlab
152 # 152 #
153 # Returns boolean 153 # Returns boolean
154 def valid_emoji?(emoji) 154 def valid_emoji?(emoji)
155 - Emoji.names.include? emoji 155 + Emoji.find_by_name emoji
156 end 156 end
157 157
158 # Private: Dispatches to a dedicated processing method based on reference 158 # Private: Dispatches to a dedicated processing method based on reference