diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-04-25 22:26:13 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-04-25 22:26:13 +0000 |
| commit | 6ff740ff9484691750f3eadf12125fd362efe61c (patch) | |
| tree | 722248f555b3dbe02095dcbd384a236d890d2045 /Gemfile.lock | |
| parent | 48f516a84376c5e9942ffad456f2f82dc9f6e7ad (diff) | |
| parent | 49961bff661dcd6f5bcfa0abeb1c2461a0d042bc (diff) | |
| download | gitlab-ce-6ff740ff9484691750f3eadf12125fd362efe61c.tar.gz | |
Merge branch 'upgrade-gitlab-grit' into 'master'
Upgrade gitlab-grit gem to 2.8.1, loosening the mime-types gem's version dependency.
Changelog for mime-types: https://github.com/mime-types/ruby-mime-types/blob/master/History.rdoc
Resolves #15101.
See merge request !3901
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index f6558fc44fe..679c52eff25 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -346,10 +346,10 @@ GEM flowdock (~> 0.7) gitlab-grit (>= 2.4.1) multi_json - gitlab-grit (2.7.3) + gitlab-grit (2.8.1) charlock_holmes (~> 0.6) diff-lcs (~> 1.1) - mime-types (~> 1.15) + mime-types (>= 1.16, < 3) posix-spawn (~> 0.3) gitlab_emoji (0.3.1) gemojione (~> 2.2, >= 2.2.1) @@ -465,7 +465,7 @@ GEM mime-types (>= 1.16, < 4) mail_room (0.6.1) method_source (0.8.2) - mime-types (1.25.1) + mime-types (2.99.1) mimemagic (0.3.0) mini_portile2 (2.0.0) minitest (5.7.0) |