summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorMarin Jankovski <marin@gitlab.com>2014-03-20 11:56:52 +0100
committerMarin Jankovski <marin@gitlab.com>2014-03-20 13:33:16 +0100
commit817f5ff6a3da3bcb494109bffbd9eca2fedc20b0 (patch)
treee4aeca005e3112c5aafb26b892b4e55a791091db /Gemfile
parentc0090a3ff50802d796ec36f49ade1bb4fdd4d190 (diff)
downloadgitlab-ce-817f5ff6a3da3bcb494109bffbd9eca2fedc20b0.tar.gz
Use gitlab_emoji gem instead of gemoji.
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 63f5e6d057c..786b0ad4db3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -165,7 +165,7 @@ gem "modernizr", "2.6.2"
gem "raphael-rails", "~> 2.1.2"
gem 'bootstrap-sass', '~> 3.0'
gem "font-awesome-rails", '~> 3.2'
-gem "gemoji", "~> 1.3.0"
+gem "gitlab_emoji", "~> 0.0.1"
gem "gon", '~> 5.0.0'
gem 'nprogress-rails'