diff options
| author | James Lopez <james@jameslopez.es> | 2016-02-29 15:49:00 +0100 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-02-29 15:49:00 +0100 |
| commit | 8fe72af3dc14a94e0823ed21016d005f509ea2a1 (patch) | |
| tree | 8db096bd899aad335dfd5acfefa16f471586c1ab /Gemfile.lock | |
| parent | 303e9eb5bfa528e5df3f8b3e76596b2d4401acf4 (diff) | |
| parent | 912e64381543c38ccf2e0d5f22b9986f49879278 (diff) | |
| download | gitlab-ce-8fe72af3dc14a94e0823ed21016d005f509ea2a1.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/contributions-forked-projects
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 4681adf2bd0..d0f780e9519 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -468,6 +468,7 @@ GEM method_source (0.8.2) mime-types (1.25.1) mimemagic (0.3.0) + mini_magick (4.4.0) mini_portile2 (2.0.0) minitest (5.7.0) mousetrap-rails (1.4.6) @@ -479,6 +480,7 @@ GEM net-ldap (0.12.1) net-ssh (3.0.1) netrc (0.11.0) + newrelic_rpm (3.14.1.311) nokogiri (1.6.7.2) mini_portile2 (~> 2.0.0.rc2) nprogress-rails (0.1.6.7) @@ -722,7 +724,7 @@ GEM activesupport (>= 3.1, < 4.3) select2-rails (3.5.9.3) thor (~> 0.14) - sentry-raven (0.15.4) + sentry-raven (0.15.6) faraday (>= 0.7.6) settingslogic (2.0.9) sexp_processor (4.6.0) @@ -954,11 +956,13 @@ DEPENDENCIES loofah (~> 2.0.3) mail_room (~> 0.6.1) method_source (~> 0.8) + mini_magick (~> 4.4.0) minitest (~> 5.7.0) mousetrap-rails (~> 1.4.6) mysql2 (~> 0.3.16) nested_form (~> 0.3.2) net-ssh (~> 3.0.1) + newrelic_rpm (~> 3.14) nokogiri (~> 1.6.7, >= 1.6.7.2) nprogress-rails (~> 0.1.6.7) oauth2 (~> 1.0.0) @@ -1007,7 +1011,7 @@ DEPENDENCIES sdoc (~> 0.3.20) seed-fu (~> 2.3.5) select2-rails (~> 3.5.9) - sentry-raven + sentry-raven (~> 0.15) settingslogic (~> 2.0.9) sham_rack shoulda-matchers (~> 2.8.0) |