diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-06-24 21:04:03 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-06-24 21:04:03 +0000 |
| commit | 5f678ae4e572a534c9dcbb99822e92b26d94677c (patch) | |
| tree | 74807a7eef8a284eaab5d8f6495783ce6858b23b | |
| parent | e45d6043e8dc8a159e276ec9ef1763f0e98afc39 (diff) | |
| parent | 83a9e82ff6ecd49b7af5dcdac26090b70666feb8 (diff) | |
| download | gitlab-ce-5f678ae4e572a534c9dcbb99822e92b26d94677c.tar.gz | |
Merge branch 'upgrade-sentry' into 'master'
Upgrade sentry-raven from 0.15.6 to 1.1.0.
Changelog: https://github.com/getsentry/raven-ruby/releases
Closes #18804
See merge request !4913
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -234,7 +234,7 @@ gem 'net-ssh', '~> 3.0.1' gem 'base32', '~> 0.3.0' # Sentry integration -gem 'sentry-raven', '~> 0.15' +gem 'sentry-raven', '~> 1.1.0' gem 'premailer-rails', '~> 1.9.0' diff --git a/Gemfile.lock b/Gemfile.lock index 7ea7ea95c1b..3f3ceb667b5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -656,7 +656,7 @@ GEM activesupport (>= 3.1, < 4.3) select2-rails (3.5.9.3) thor (~> 0.14) - sentry-raven (0.15.6) + sentry-raven (1.1.0) faraday (>= 0.7.6) settingslogic (2.0.9) sexp_processor (4.7.0) @@ -952,7 +952,7 @@ DEPENDENCIES sdoc (~> 0.3.20) seed-fu (~> 2.3.5) select2-rails (~> 3.5.9) - sentry-raven (~> 0.15) + sentry-raven (~> 1.1.0) settingslogic (~> 2.0.9) sham_rack shoulda-matchers (~> 2.8.0) |