Download as
Browse Code »

Commit 817f5ff6a3da3bcb494109bffbd9eca2fedc20b0

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

Use gitlab_emoji gem instead of gemoji.

Showing 2 changed files with 6 additions and 3 deletions   Show diff stats
@@ -165,7 +165,7 @@ gem "modernizr", "2.6.2" @@ -165,7 +165,7 @@ gem "modernizr", "2.6.2"
165 gem "raphael-rails", "~> 2.1.2" 165 gem "raphael-rails", "~> 2.1.2"
166 gem 'bootstrap-sass', '~> 3.0' 166 gem 'bootstrap-sass', '~> 3.0'
167 gem "font-awesome-rails", '~> 3.2' 167 gem "font-awesome-rails", '~> 3.2'
168 -gem "gemoji", "~> 1.3.0" 168 +gem "gitlab_emoji", "~> 0.0.1"
169 gem "gon", '~> 5.0.0' 169 gem "gon", '~> 5.0.0'
170 gem 'nprogress-rails' 170 gem 'nprogress-rails'
171 171
@@ -128,6 +128,8 @@ GEM @@ -128,6 +128,8 @@ GEM
128 mail (~> 2.2) 128 mail (~> 2.2)
129 email_validator (1.4.0) 129 email_validator (1.4.0)
130 activemodel 130 activemodel
  131 + emoji (1.0.1)
  132 + json
131 enumerize (0.7.0) 133 enumerize (0.7.0)
132 activesupport (>= 3.2) 134 activesupport (>= 3.2)
133 equalizer (0.0.8) 135 equalizer (0.0.8)
@@ -165,7 +167,6 @@ GEM @@ -165,7 +167,6 @@ GEM
165 formatador (0.2.4) 167 formatador (0.2.4)
166 gemnasium-gitlab-service (0.2.1) 168 gemnasium-gitlab-service (0.2.1)
167 rugged (~> 0.19) 169 rugged (~> 0.19)
168 - gemoji (1.3.1)  
169 gherkin-ruby (0.3.1) 170 gherkin-ruby (0.3.1)
170 racc 171 racc
171 github-markdown (0.5.5) 172 github-markdown (0.5.5)
@@ -190,6 +191,8 @@ GEM @@ -190,6 +191,8 @@ GEM
190 charlock_holmes (~> 0.6.6) 191 charlock_holmes (~> 0.6.6)
191 escape_utils (~> 0.2.4) 192 escape_utils (~> 0.2.4)
192 mime-types (~> 1.19) 193 mime-types (~> 1.19)
  194 + gitlab_emoji (0.0.1)
  195 + emoji (~> 1.0.1)
193 gitlab_git (5.7.1) 196 gitlab_git (5.7.1)
194 activesupport (~> 4.0.0) 197 activesupport (~> 4.0.0)
195 charlock_holmes (~> 0.6.9) 198 charlock_holmes (~> 0.6.9)
@@ -593,12 +596,12 @@ DEPENDENCIES @@ -593,12 +596,12 @@ DEPENDENCIES
593 font-awesome-rails (~> 3.2) 596 font-awesome-rails (~> 3.2)
594 foreman 597 foreman
595 gemnasium-gitlab-service (~> 0.2) 598 gemnasium-gitlab-service (~> 0.2)
596 - gemoji (~> 1.3.0)  
597 github-markup (~> 0.7.4)! 599 github-markup (~> 0.7.4)!
598 gitlab-flowdock-git-hook (~> 0.4.2) 600 gitlab-flowdock-git-hook (~> 0.4.2)
599 gitlab-gollum-lib (~> 1.1.0) 601 gitlab-gollum-lib (~> 1.1.0)
600 gitlab-grack (~> 2.0.0.pre) 602 gitlab-grack (~> 2.0.0.pre)
601 gitlab-linguist (~> 3.0.0) 603 gitlab-linguist (~> 3.0.0)
  604 + gitlab_emoji (~> 0.0.1)
602 gitlab_git (~> 5.7.1) 605 gitlab_git (~> 5.7.1)
603 gitlab_meta (= 6.0) 606 gitlab_meta (= 6.0)
604 gitlab_omniauth-ldap (= 1.0.4) 607 gitlab_omniauth-ldap (= 1.0.4)