diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-02-19 08:11:02 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-02-19 08:11:02 +0000 |
| commit | ad12f11f3ed81637b4d72ce9e494fdbd1f26b1bb (patch) | |
| tree | 3097d416524866e13efc21bbb9e1c441cac0a9f9 /Gemfile.lock | |
| parent | cb0b7de48267abee85d39571ae55a0e988cc21eb (diff) | |
| parent | 20fcc5d6f602354fe9d4c1c811496798a053f7ba (diff) | |
| download | gitlab-ce-ad12f11f3ed81637b4d72ce9e494fdbd1f26b1bb.tar.gz | |
Merge branch 'rs-emoji' into 'master'
Update Gemojione for new hotness :sparkles:
Before | After
------ | -----
 | 
See merge request !2800
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index cebd79843b1..10750805ca4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -336,7 +336,7 @@ GEM ruby-progressbar (~> 1.4) gemnasium-gitlab-service (0.2.6) rugged (~> 0.21) - gemojione (2.1.1) + gemojione (2.2.1) json get_process_mem (0.2.0) gherkin-ruby (0.3.2) @@ -355,8 +355,8 @@ GEM diff-lcs (~> 1.1) mime-types (~> 1.15) posix-spawn (~> 0.3) - gitlab_emoji (0.2.0) - gemojione (~> 2.1) + gitlab_emoji (0.3.1) + gemojione (~> 2.2, >= 2.2.1) gitlab_git (8.1.0) activesupport (~> 4.0) charlock_holmes (~> 0.7.3) @@ -931,7 +931,7 @@ DEPENDENCIES github-linguist (~> 4.7.0) github-markup (~> 1.3.1) gitlab-flowdock-git-hook (~> 1.0.1) - gitlab_emoji (~> 0.2.0) + gitlab_emoji (~> 0.3.0) gitlab_git (~> 8.1) gitlab_meta (= 7.0) gitlab_omniauth-ldap (~> 1.2.1) |