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.lock | |
| 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.lock')
| -rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 1 insertions, 1 deletions
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) |