diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-06-15 16:56:02 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2016-06-15 16:56:02 +0300 |
| commit | a95f8b9a82e79781dc99ff36d6ab5f9ba293ae52 (patch) | |
| tree | 18eacfe4ac2cb19684042af5f9ae850f7e502e87 /Gemfile.lock | |
| parent | a6042a2dbb673c07251924ac59d49f000c59b0ad (diff) | |
| parent | 0fdfd2dd6e01648f4daf6853f11a3ffc9a678a55 (diff) | |
Merge branch 'stanhu/gitlab-ce-fix-error-500-false-binary-negative'
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index d517fcb8ed3..c1c8c175b1d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -277,7 +277,7 @@ GEM posix-spawn (~> 0.3) gitlab_emoji (0.3.1) gemojione (~> 2.2, >= 2.2.1) - gitlab_git (10.1.0) + gitlab_git (10.1.3) activesupport (~> 4.0) charlock_holmes (~> 0.7.3) github-linguist (~> 4.7.0) @@ -400,7 +400,7 @@ GEM mime-types (>= 1.16, < 4) mail_room (0.7.0) method_source (0.8.2) - mime-types (2.99.1) + mime-types (2.99.2) mimemagic (0.3.0) mini_portile2 (2.1.0) minitest (5.7.0) |