diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-07-05 17:08:35 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-07-05 17:08:35 +0000 |
| commit | aefb8a1741b58a10832e63c73210b8608c2be753 (patch) | |
| tree | 48d9f59a52c8bf0c102f6e1e4d9ecbf36a6dd025 /Gemfile.lock | |
| parent | 10855e7fff39dbbea791eb1d3b49bb5fc9263455 (diff) | |
| parent | f31f78cea32b1650d5cb0a7784a28848b8446e89 (diff) | |
| download | gitlab-ce-aefb8a1741b58a10832e63c73210b8608c2be753.tar.gz | |
Merge branch 'update-gemoji' into 'master'
Add lib/gitlab/emoji.rb instead of gitlab_emoji gem and upgrade Gemojione
- No reason to split it into a separate gem when the gem barely did anything. We can use gemojione directly, making updating gemojione that much easier. Unless there's a particularly good reason we were using the gem?
- Fixes the Rake task since it broke after all the AwardEmoji changes.
- Update gemojione to 2.6.1.
Spring Update changes! http://emojione.com/releases/#2.2.0
See merge request !4919
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 76127ce08e3..22363e3e2d2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -255,7 +255,7 @@ GEM ruby-progressbar (~> 1.4) gemnasium-gitlab-service (0.2.6) rugged (~> 0.21) - gemojione (2.2.1) + gemojione (2.6.1) json get_process_mem (0.2.0) gherkin-ruby (0.3.2) @@ -274,8 +274,6 @@ GEM diff-lcs (~> 1.1) mime-types (>= 1.16, < 3) posix-spawn (~> 0.3) - gitlab_emoji (0.3.1) - gemojione (~> 2.2, >= 2.2.1) gitlab_git (10.2.3) activesupport (~> 4.0) charlock_holmes (~> 0.7.3) @@ -859,10 +857,10 @@ DEPENDENCIES foreman fuubar (~> 2.0.0) gemnasium-gitlab-service (~> 0.2) + gemojione (~> 2.6) github-linguist (~> 4.7.0) github-markup (~> 1.3.1) gitlab-flowdock-git-hook (~> 1.0.1) - gitlab_emoji (~> 0.3.0) gitlab_git (~> 10.2) gitlab_meta (= 7.0) gitlab_omniauth-ldap (~> 1.2.1) |