summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2018-03-14 17:01:12 +0000
committerDouwe Maan <douwe@gitlab.com>2018-03-14 17:01:12 +0000
commit9c10e9d4cac101008b63d3f8ff30ecc7e0261897 (patch)
tree7af90a6d18abce3765b96d890e634d6687814f0f
parent8b0e07f95b1d5554aa9e52312b3d1b9dc7003396 (diff)
parent72eb2b911e64263af09f0ef878f2e983410e5d60 (diff)
downloadgitlab-ce-9c10e9d4cac101008b63d3f8ff30ecc7e0261897.tar.gz
Merge branch 'update-sentry-raven' into 'master'
Update sentry-raven 2.5.3 -> 2.7 (Fixes #24029) Closes #24029 See merge request gitlab-org/gitlab-ce!17709
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
2 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index fda6e71043c..5f3ad4895a6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -264,7 +264,7 @@ gem 'virtus', '~> 1.0.1'
gem 'base32', '~> 0.3.0'
# Sentry integration
-gem 'sentry-raven', '~> 2.5.3'
+gem 'sentry-raven', '~> 2.7'
gem 'premailer-rails', '~> 1.9.7'
diff --git a/Gemfile.lock b/Gemfile.lock
index 2baa84960c3..fa55f14728e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -843,7 +843,7 @@ GEM
selenium-webdriver (3.5.0)
childprocess (~> 0.5)
rubyzip (~> 1.0)
- sentry-raven (2.5.3)
+ sentry-raven (2.7.2)
faraday (>= 0.7.6, < 1.0)
settingslogic (2.0.9)
sexp_processor (4.9.0)
@@ -1182,7 +1182,7 @@ DEPENDENCIES
seed-fu (~> 2.3.7)
select2-rails (~> 3.5.9)
selenium-webdriver (~> 3.5)
- sentry-raven (~> 2.5.3)
+ sentry-raven (~> 2.7)
settingslogic (~> 2.0.9)
sham_rack (~> 1.3.6)
shoulda-matchers (~> 3.1.2)