summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiyad Preukschas <riyad@informatik.uni-bremen.de>2012-10-16 16:20:16 +0200
committerRiyad Preukschas <riyad@informatik.uni-bremen.de>2012-10-18 01:10:35 +0200
commitb42c53c2e592e076a63d12e6c9d1a158a9c01212 (patch)
tree54c986b79511c027a71e8da72ea602203af6810e
parentdb469ea3e69f03f5c1966958041bca91a04686ce (diff)
downloadgitlab-ce-b42c53c2e592e076a63d12e6c9d1a158a9c01212.tar.gz
Add gemoji gem
-rw-r--r--Gemfile1
-rw-r--r--Gemfile.lock2
2 files changed, 3 insertions, 0 deletions
diff --git a/Gemfile b/Gemfile
index d026aa07321..65c69e7e629 100644
--- a/Gemfile
+++ b/Gemfile
@@ -94,6 +94,7 @@ gem 'settingslogic'
# Misc
gem "foreman"
+gem 'gemoji', require: 'emoji/railtie'
gem "git"
group :assets do
diff --git a/Gemfile.lock b/Gemfile.lock
index 22842867182..7dd69034b68 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -140,6 +140,7 @@ GEM
sass-rails (>= 3.1.1)
foreman (0.47.0)
thor (>= 0.13.6)
+ gemoji (1.1.1)
gherkin-ruby (0.2.1)
git (1.2.5)
github-linguist (2.3.4)
@@ -422,6 +423,7 @@ DEPENDENCIES
ffaker
font-awesome-sass-rails (~> 2.0.0)
foreman
+ gemoji
git
github-linguist (~> 2.3.4)
github-markup (~> 0.7.4)