summaryrefslogtreecommitdiff
path: root/app/assets/javascripts
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-05-24 08:17:39 +0000
committerPhil Hughes <me@iamphill.com>2017-05-24 08:17:39 +0000
commite07c75513db023672b7042869f46ee35753cfd34 (patch)
treecbf63c5006a7811bb92559274934e539076d687a /app/assets/javascripts
parent34939c89324b856604b8ed55be5aaaec7ac0dd96 (diff)
parentef73fe300c047d659c5bb665f200531efa95ac0b (diff)
downloadgitlab-ce-e07c75513db023672b7042869f46ee35753cfd34.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,