From 75f7b407825e07013c02d6f6edecfbd4a6db6422 Mon Sep 17 00:00:00 2001
From: Robert Speicher <robert@gitlab.com>
Date: Thu, 19 Jan 2017 16:02:09 +0000
Subject: Merge branch 'brakeman-upgrade' into 'master'

Upgrade Brakeman to 3.4.1

Closes #26820

See merge request !8629
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index bf177977bf4..83ba5d31b92 100644
--- a/Gemfile
+++ b/Gemfile
@@ -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)
-- 
cgit v1.2.3