diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2015-12-05 17:49:32 -0500 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-12-05 17:49:32 -0500 |
| commit | 6ee43ada3a68407affd9e73ff4f1d5f9665da2d4 (patch) | |
| tree | 1dc3d933f0a650a947965ba4d538cfdb783c141e | |
| parent | d2f9a9012d55a7dc9c8e9e61b946c52836a1d8f1 (diff) | |
| download | gitlab-ce-6ee43ada3a68407affd9e73ff4f1d5f9665da2d4.tar.gz | |
Bump gitlab_emoji to ~> 0.2.0rs-update-gitlab_emoji
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -193,7 +193,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' diff --git a/Gemfile.lock b/Gemfile.lock index cd1855758b2..7eaa0d2c841 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -864,7 +864,7 @@ DEPENDENCIES github-linguist (~> 4.7.0) github-markup (~> 1.3.1) gitlab-flowdock-git-hook (~> 1.0.1) - gitlab_emoji (~> 0.1) + gitlab_emoji (~> 0.2.0) gitlab_git (~> 7.2.20) gitlab_meta (= 7.0) gitlab_omniauth-ldap (~> 1.2.1) |