summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-10-06 08:33:11 +0200
committerRémy Coutable <remy@rymai.me>2016-10-06 08:33:11 +0200
commitd51bb99a7e7c4dce4abefbf4967aa69054066c3b (patch)
treea6aba13ef5161890bbebd0b48bfc36ad3d8f8223 /Gemfile.lock
parent7e493b11546f15f7871a249474edf6afd418af89 (diff)
parent3f57ea0c0ba55f2612997acfb531f83a70b73323 (diff)
downloadgitlab-ce-d51bb99a7e7c4dce4abefbf4967aa69054066c3b.tar.gz
Merge commit 'dev/security' into 'master'
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock6
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 3f756fec929..96b49faf727 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -665,8 +665,8 @@ GEM
activesupport (>= 3.1)
select2-rails (3.5.9.3)
thor (~> 0.14)
- sentry-raven (1.1.0)
- faraday (>= 0.7.6)
+ sentry-raven (2.0.2)
+ faraday (>= 0.7.6, < 0.10.x)
settingslogic (2.0.9)
sexp_processor (4.7.0)
sham_rack (1.3.6)
@@ -948,7 +948,7 @@ DEPENDENCIES
sdoc (~> 0.3.20)
seed-fu (~> 2.3.5)
select2-rails (~> 3.5.9)
- sentry-raven (~> 1.1.0)
+ sentry-raven (~> 2.0.0)
settingslogic (~> 2.0.9)
sham_rack (~> 1.3.6)
shoulda-matchers (~> 2.8.0)