From eabd5cc2de9021186f9fbc901eb584ad319f6a00 Mon Sep 17 00:00:00 2001
From: Robert Speicher <robert@gitlab.com>
Date: Tue, 23 Feb 2016 21:19:55 +0000
Subject: [PATCH] Merge branch 'rs-update-raven' into 'master'

Update sentry-raven to 0.15.6

Fixes a few bugs, most notably (for our purposes): https://github.com/getsentry/raven-ruby/pull/450

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

diff --git a/CHANGELOG b/CHANGELOG
index a7a082f5f3..9a08d4d4e7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,6 +9,7 @@ v 8.5.1
   - Fix an issue where MRs weren't sortable
   - Restrict permissions on public/uploads
   - Set of small UI fixes to project, profile, and wiki pages
+  - Update sentry-raven gem to 0.15.6
 
 v 8.5.0
   - Fix duplicate "me" in tooltip of the "thumbsup" awards Emoji (Stan Hu)
diff --git a/Gemfile b/Gemfile
index 7c6a100d28..bae8f561a7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -218,7 +218,7 @@ gem 'virtus',             '~> 1.0.1'
 gem 'net-ssh',            '~> 3.0.1'
 
 # Sentry integration
-gem 'sentry-raven'
+gem 'sentry-raven', '~> 0.15'
 
 # Metrics
 group :metrics do
diff --git a/Gemfile.lock b/Gemfile.lock
index cb2be39861..2614d5047b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -722,7 +722,7 @@ GEM
       activesupport (>= 3.1, < 4.3)
     select2-rails (3.5.9.3)
       thor (~> 0.14)
-    sentry-raven (0.15.4)
+    sentry-raven (0.15.6)
       faraday (>= 0.7.6)
     settingslogic (2.0.9)
     sexp_processor (4.6.0)
@@ -1007,7 +1007,7 @@ DEPENDENCIES
   sdoc (~> 0.3.20)
   seed-fu (~> 2.3.5)
   select2-rails (~> 3.5.9)
-  sentry-raven
+  sentry-raven (~> 0.15)
   settingslogic (~> 2.0.9)
   sham_rack
   shoulda-matchers (~> 2.8.0)