diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-02-19 08:11:02 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-02-19 08:11:02 +0000 |
| commit | ad12f11f3ed81637b4d72ce9e494fdbd1f26b1bb (patch) | |
| tree | 3097d416524866e13efc21bbb9e1c441cac0a9f9 /Gemfile | |
| parent | cb0b7de48267abee85d39571ae55a0e988cc21eb (diff) | |
| parent | 20fcc5d6f602354fe9d4c1c811496798a053f7ba (diff) | |
| download | gitlab-ce-ad12f11f3ed81637b4d72ce9e494fdbd1f26b1bb.tar.gz | |
Merge branch 'rs-emoji' into 'master'
Update Gemojione for new hotness :sparkles:
Before | After
------ | -----
 | 
See merge request !2800
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -204,7 +204,7 @@ gem 'jquery-turbolinks', '~> 2.1.0' gem 'addressable', '~> 2.3.8' gem 'bootstrap-sass', '~> 3.3.0' gem 'font-awesome-rails', '~> 4.2' -gem 'gitlab_emoji', '~> 0.2.0' +gem 'gitlab_emoji', '~> 0.3.0' gem 'gon', '~> 6.0.1' gem 'jquery-atwho-rails', '~> 1.3.2' gem 'jquery-rails', '~> 4.0.0' |