summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2018-04-02 16:30:34 +0000
committerRobert Speicher <robert@gitlab.com>2018-04-02 16:30:34 +0000
commit8ecc50ba28bba12e5d3ef24b69e0fb3fac40e452 (patch)
treeea862083b3690f74f772cd4e1962a0324ee50127
parentc2d8d08da8324b5a743565a60b733d8144ba5d59 (diff)
parent4c36a0cb1759d2e6d13b26b6e1e9bff4d450ed25 (diff)
downloadgitlab-ce-8ecc50ba28bba12e5d3ef24b69e0fb3fac40e452.tar.gz
Merge branch '44878-update-brakeman-3.6.1-to-4.2.1' into 'master'
Update brakeman to 4.2.1 Closes #44878 See merge request gitlab-org/gitlab-ce!18122
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
-rw-r--r--changelogs/unreleased/44878-update-brakeman-3-6-1-to-4-2-1.yml5
3 files changed, 8 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index ba6c631a191..fd174a60c66 100644
--- a/Gemfile
+++ b/Gemfile
@@ -309,7 +309,7 @@ end
group :development do
gem 'foreman', '~> 0.84.0'
- gem 'brakeman', '~> 3.6.0', require: false
+ gem 'brakeman', '~> 4.2', require: false
gem 'letter_opener_web', '~> 1.3.0'
gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 3e89e598bd4..55e7bd9492a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -95,7 +95,7 @@ GEM
autoprefixer-rails (>= 5.2.1)
sass (>= 3.3.4)
bootstrap_form (2.7.0)
- brakeman (3.6.1)
+ brakeman (4.2.1)
browser (2.2.0)
builder (3.2.3)
bullet (5.5.1)
@@ -1012,7 +1012,7 @@ DEPENDENCIES
binding_of_caller (~> 0.7.2)
bootstrap-sass (~> 3.3.0)
bootstrap_form (~> 2.7.0)
- brakeman (~> 3.6.0)
+ brakeman (~> 4.2)
browser (~> 2.2)
bullet (~> 5.5.0)
bundler-audit (~> 0.5.0)
diff --git a/changelogs/unreleased/44878-update-brakeman-3-6-1-to-4-2-1.yml b/changelogs/unreleased/44878-update-brakeman-3-6-1-to-4-2-1.yml
new file mode 100644
index 00000000000..f5710cf4f7f
--- /dev/null
+++ b/changelogs/unreleased/44878-update-brakeman-3-6-1-to-4-2-1.yml
@@ -0,0 +1,5 @@
+---
+title: Update brakeman 3.6.1 to 4.2.1
+merge_request: 18122
+author: Takuya Noguchi
+type: other