diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-01-19 16:02:09 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-01-19 16:02:09 +0000 |
| commit | 52762df285751dec4e54c4c55be5bbecb3bd4fc9 (patch) | |
| tree | b6367b182eada13f6b6639f0040c38c9a946f8c4 | |
| parent | 4616617dd75653ff8f976cebae6ceefab68f40d6 (diff) | |
| parent | 504bdaf38d6987840f46cf0ff51a41140eb83dd9 (diff) | |
| download | gitlab-ce-52762df285751dec4e54c4c55be5bbecb3bd4fc9.tar.gz | |
Merge branch 'brakeman-upgrade' into 'master'
Upgrade Brakeman to 3.4.1
Closes #26820
See merge request !8629
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -252,7 +252,7 @@ end group :development do gem 'foreman', '~> 0.78.0' - gem 'brakeman', '~> 3.3.0', require: false + gem 'brakeman', '~> 3.4.0', require: false gem 'letter_opener_web', '~> 1.3.0' gem 'bullet', '~> 5.2.0', require: false diff --git a/Gemfile.lock b/Gemfile.lock index 230d1785aa3..104e6444803 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -88,7 +88,7 @@ GEM bootstrap-sass (3.3.6) autoprefixer-rails (>= 5.2.1) sass (>= 3.3.4) - brakeman (3.3.2) + brakeman (3.4.1) browser (2.2.0) builder (3.2.2) bullet (5.2.0) @@ -844,7 +844,7 @@ DEPENDENCIES better_errors (~> 1.0.1) binding_of_caller (~> 0.7.2) bootstrap-sass (~> 3.3.0) - brakeman (~> 3.3.0) + brakeman (~> 3.4.0) browser (~> 2.2) bullet (~> 5.2.0) bundler-audit (~> 0.5.0) |