diff options
| author | Valery Sizov <valery@gitlab.com> | 2015-12-11 07:43:59 +0000 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2015-12-11 07:43:59 +0000 |
| commit | 73942b15e775d34ea3563545942978a726c5f28e (patch) | |
| tree | bdb254779f2a1cdafbe9b048ec076161d343939c | |
| parent | 74dcbec369aca9dfa181c9a82e1978ba2396773a (diff) | |
| parent | 6ee43ada3a68407affd9e73ff4f1d5f9665da2d4 (diff) | |
| download | gitlab-ce-73942b15e775d34ea3563545942978a726c5f28e.tar.gz | |
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
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 2 |
2 files changed, 2 insertions, 2 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' diff --git a/Gemfile.lock b/Gemfile.lock index 4b97bcd610e..0db1c6760f8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -879,7 +879,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) |