diff options
| author | Marin Jankovski <marin@gitlab.com> | 2015-09-15 13:47:43 +0000 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2015-09-15 13:47:43 +0000 |
| commit | 0ecc57fe50562bf2afede2e89d0bab69de89aebd (patch) | |
| tree | 721b0edcbebd2e757b619b31438ca3b34f926a14 | |
| parent | 3315e89df65677b71d9ee74114bc88279a33d516 (diff) | |
| parent | 0d010088761a0116a5e4317f2dd0c61b510ee1b3 (diff) | |
| download | gitlab-ce-0ecc57fe50562bf2afede2e89d0bab69de89aebd.tar.gz | |
Merge branch 'update-gitlab-emoji' into 'master'
Update gitlab_emoji to 0.1.1
See merge request !1290
| -rw-r--r-- | Gemfile.lock | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index f3091857b7e..29f7213bd67 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -253,7 +253,7 @@ GEM ruby-progressbar (~> 1.4) gemnasium-gitlab-service (0.2.6) rugged (~> 0.21) - gemojione (2.0.0) + gemojione (2.0.1) json gherkin-ruby (0.3.1) racc @@ -272,7 +272,7 @@ GEM charlock_holmes (~> 0.6.6) escape_utils (~> 0.2.4) mime-types (~> 1.19) - gitlab_emoji (0.1.0) + gitlab_emoji (0.1.1) gemojione (~> 2.0) gitlab_git (7.2.15) activesupport (~> 4.0) @@ -889,6 +889,3 @@ DEPENDENCIES virtus webmock (~> 1.21.0) wikicloth (= 0.8.1) - -BUNDLED WITH - 1.10.5 |