summaryrefslogtreecommitdiff
path: root/app/assets/javascripts
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-05-24 08:17:39 +0000
committerTimothy Andrew <mail@timothyandrew.net>2017-05-24 12:55:50 +0000
commit309e5974f1ef14a28e2a9104ed5c45cfa7d98243 (patch)
treeb1286956c1013b6841bbb0eecc47c349a612121d /app/assets/javascripts
parentf50598f704817115927ea478bd1a4138bd66edb5 (diff)
downloadgitlab-ce-309e5974f1ef14a28e2a9104ed5c45cfa7d98243.tar.gz
Merge branch 'sentry-clientside-releases' into 'master'
Read HEAD commit and use as sentry releases value Closes #32535 See merge request !11565
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r--app/assets/javascripts/raven/index.js4
-rw-r--r--app/assets/javascripts/raven/raven_config.js2
2 files changed, 6 insertions, 0 deletions
diff --git a/app/assets/javascripts/raven/index.js b/app/assets/javascripts/raven/index.js
index 5325e495815..edc2293915f 100644
--- a/app/assets/javascripts/raven/index.js
+++ b/app/assets/javascripts/raven/index.js
@@ -6,6 +6,10 @@ const index = function index() {
currentUserId: gon.current_user_id,
whitelistUrls: [gon.gitlab_url],
isProduction: process.env.NODE_ENV,
+ release: gon.revision,
+ tags: {
+ revision: gon.revision,
+ },
});
return RavenConfig;
diff --git a/app/assets/javascripts/raven/raven_config.js b/app/assets/javascripts/raven/raven_config.js
index c7fe1cacf49..da3fb7a6744 100644
--- a/app/assets/javascripts/raven/raven_config.js
+++ b/app/assets/javascripts/raven/raven_config.js
@@ -57,6 +57,8 @@ const RavenConfig = {
configure() {
Raven.config(this.options.sentryDsn, {
+ release: this.options.release,
+ tags: this.options.tags,
whitelistUrls: this.options.whitelistUrls,
environment: this.options.isProduction ? 'production' : 'development',
ignoreErrors: this.IGNORE_ERRORS,