summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-03-27 20:39:59 +0000
committerRobert Speicher <robert@gitlab.com>2016-03-27 20:39:59 +0000
commitdb0da43a46f5fe5afd204795fba7253c928faf5a (patch)
tree340e482ba192dd8c75519219a849fa789b90eb1e /Gemfile
parentf7a9fc9cf81e8d58abb6e5b4c607626d0026c763 (diff)
parentf967d5cf3d85d1fd0d48935ec7f9a5449383c43d (diff)
downloadgitlab-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')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index fecb2a25093..006e53e0c10 100644
--- a/Gemfile
+++ b/Gemfile
@@ -234,7 +234,7 @@ end
group :development do
gem "foreman"
- gem 'brakeman', '~> 3.1.0', require: false
+ gem 'brakeman', '~> 3.2.0', require: false
gem "annotate", "~> 2.6.0"
gem "letter_opener", '~> 1.1.2'