summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-01-28 18:43:40 +0000
committerRobert Speicher <rspeicher@gmail.com>2016-01-31 19:26:59 -0500
commitfa69b067a70ff2409d34bd1cef17a2a175499dda (patch)
tree1646bf16fe07093ee3af1f5205e4bf20941c5bff
parentff1e0ecfc6344c9609da8d5775486419872b8922 (diff)
downloadgitlab-ce-fa69b067a70ff2409d34bd1cef17a2a175499dda.tar.gz
Merge branch 'update_sentry_gem' into 'master'
Update sentry-raven gem. Should resolve `fatal: Not a git repository (or any of the parent directories): .git` warnings. Fixes #12657 See merge request !2636
-rw-r--r--CHANGELOG2
-rw-r--r--Gemfile.lock2
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 78dc0fe0c89..602af29deb9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,8 @@ Please view this file on the master branch, on stable branches it's out of date.
v 8.4.3
- Correctly highlight MR diff when MR has merge conflicts
- Fix highlighting in blame view
+ - Update sentry-raven gem to prevent "Not a git repository" console output
+ when running certain commands
v 8.4.2
- Bump required gitlab-workhorse version to bring in a fix for missing
diff --git a/Gemfile.lock b/Gemfile.lock
index 14d2c76bc3b..8128203e2fe 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -725,7 +725,7 @@ GEM
activesupport (>= 3.1, < 4.3)
select2-rails (3.5.9.3)
thor (~> 0.14)
- sentry-raven (0.15.3)
+ sentry-raven (0.15.4)
faraday (>= 0.7.6)
settingslogic (2.0.9)
sexp_processor (4.6.0)