summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-02-18 21:10:35 +0000
committerDouwe Maan <douwe@gitlab.com>2016-02-18 21:10:35 +0000
commit6524fbeaba7c16ae8ca514c7540a1aa6e86f4129 (patch)
tree7b62cbb279276f59b005e50eae3066a23649b235 /config
parentc04e22fba8d130a58f498ff48127712d7dae17ee (diff)
parent6c9ae675b5a7c93ecc67afc4c2f147dd947d9c7e (diff)
downloadgitlab-ce-6524fbeaba7c16ae8ca514c7540a1aa6e86f4129.tar.gz
Merge branch 'rs-sentry-release-tracking' into 'master'
Add release tracking for Sentry See merge request !2863
Diffstat (limited to 'config')
-rw-r--r--config/initializers/2_app.rb4
-rw-r--r--config/initializers/sentry.rb1
2 files changed, 3 insertions, 2 deletions
diff --git a/config/initializers/2_app.rb b/config/initializers/2_app.rb
index 35b150c9929..bd74f90e7d2 100644
--- a/config/initializers/2_app.rb
+++ b/config/initializers/2_app.rb
@@ -3,6 +3,6 @@ module Gitlab
Settings
end
- VERSION = File.read(Rails.root.join("VERSION")).strip
- REVISION = Gitlab::Popen.popen(%W(#{config.git.bin_path} log --pretty=format:%h -n 1)).first.chomp
+ VERSION = File.read(Rails.root.join("VERSION")).strip.freeze
+ REVISION = Gitlab::Popen.popen(%W(#{config.git.bin_path} log --pretty=format:%h -n 1)).first.chomp.freeze
end
diff --git a/config/initializers/sentry.rb b/config/initializers/sentry.rb
index d0630b9fa07..e87899b2d5c 100644
--- a/config/initializers/sentry.rb
+++ b/config/initializers/sentry.rb
@@ -14,6 +14,7 @@ if Rails.env.production?
if sentry_enabled
Raven.configure do |config|
config.dsn = current_application_settings.sentry_dsn
+ config.release = Gitlab::REVISION
end
end
end