diff options
| author | Valery Sizov <valery@gitlab.com> | 2015-12-11 10:43:59 +0300 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2015-12-11 10:43:59 +0300 |
| commit | 73942b15e775d34ea3563545942978a726c5f28e (patch) | |
| tree | bdb254779f2a1cdafbe9b048ec076161d343939c /Gemfile | |
| parent | 74dcbec369aca9dfa181c9a82e1978ba2396773a (diff) | |
| parent | 6ee43ada3a68407affd9e73ff4f1d5f9665da2d4 (diff) | |
Merge branch 'rs-update-gitlab_emoji' into 'master'
Bump gitlab_emoji to ~> 0.2.0
A new version of this gem was released October 29th
but was never bumped in GitLab.
See merge request !1994
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -194,7 +194,7 @@ gem 'jquery-turbolinks', '~> 2.1.0' gem 'addressable', '~> 2.3.8' gem 'bootstrap-sass', '~> 3.0' gem 'font-awesome-rails', '~> 4.2' -gem 'gitlab_emoji', '~> 0.1' +gem 'gitlab_emoji', '~> 0.2.0' gem 'gon', '~> 6.0.1' gem 'jquery-atwho-rails', '~> 1.3.2' gem 'jquery-rails', '~> 3.1.3' |