diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-03-27 20:39:59 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-03-27 20:39:59 +0000 |
| commit | db0da43a46f5fe5afd204795fba7253c928faf5a (patch) | |
| tree | 340e482ba192dd8c75519219a849fa789b90eb1e /Gemfile.lock | |
| parent | f7a9fc9cf81e8d58abb6e5b4c607626d0026c763 (diff) | |
| parent | f967d5cf3d85d1fd0d48935ec7f9a5449383c43d (diff) | |
| download | gitlab-ce-db0da43a46f5fe5afd204795fba7253c928faf5a.tar.gz | |
Merge branch 'upgrade-brakeman' into 'master'
Upgrade Brakeman from 3.1.4 to 3.2.1
Includes support for Rails 5, bug fixes, and various additional vulnerability checks.
[See Changelog for more information](https://github.com/presidentbeef/brakeman/blob/master/CHANGES).
Working towards #14286.
See merge request !3397
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index a63cf318f84..f79c66f4c58 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -84,14 +84,12 @@ GEM bootstrap-sass (3.3.6) autoprefixer-rails (>= 5.2.1) sass (>= 3.3.4) - brakeman (3.1.4) + brakeman (3.2.1) erubis (~> 2.6) - fastercsv (~> 1.5) haml (>= 3.0, < 5.0) highline (>= 1.6.20, < 2.0) - multi_json (~> 1.2) - ruby2ruby (>= 2.1.1, < 2.3.0) - ruby_parser (~> 3.7.0) + ruby2ruby (~> 2.3.0) + ruby_parser (~> 3.8.1) safe_yaml (>= 1.0) sass (~> 3.0) slim (>= 1.3.6, < 4.0) @@ -208,7 +206,6 @@ GEM faraday_middleware-multi_json (0.0.6) faraday_middleware multi_json - fastercsv (1.5.5) ffaker (2.0.0) ffi (1.9.10) fission (0.5.0) @@ -706,10 +703,10 @@ GEM ruby-saml (1.1.2) nokogiri (>= 1.5.10) uuid (~> 2.3) - ruby2ruby (2.2.0) + ruby2ruby (2.3.0) ruby_parser (~> 3.1) sexp_processor (~> 4.0) - ruby_parser (3.7.2) + ruby_parser (3.8.1) sexp_processor (~> 4.1) rubyntlm (0.5.2) rubypants (0.2.0) @@ -718,7 +715,7 @@ GEM safe_yaml (1.0.4) sanitize (2.1.0) nokogiri (>= 1.4.4) - sass (3.4.20) + sass (3.4.21) sass-rails (5.0.4) railties (>= 4.0.0, < 5.0) sass (~> 3.1) @@ -742,7 +739,7 @@ GEM sentry-raven (0.15.6) faraday (>= 0.7.6) settingslogic (2.0.9) - sexp_processor (4.6.0) + sexp_processor (4.7.0) sham_rack (1.3.6) rack shoulda-matchers (2.8.0) @@ -910,7 +907,7 @@ DEPENDENCIES better_errors (~> 1.0.1) binding_of_caller (~> 0.7.2) bootstrap-sass (~> 3.3.0) - brakeman (~> 3.1.0) + brakeman (~> 3.2.0) browser (~> 1.0.0) bullet bundler-audit |