diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-02-19 11:11:02 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-02-19 18:29:55 +0300 |
| commit | da0953e65273b1346567dff09518c3eeb7463c6f (patch) | |
| tree | fcad5a5cbdea1f3f23c88f96a3b72e34c373f79b /Gemfile | |
| parent | f30004819a7c15ad53a863c9648b7d687c5af405 (diff) | |
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' |