Merge remote-tracking branch 'origin/master' into issue_14904

# Conflicts:
#	app/views/shared/issuable/_sidebar.html.haml

3 files changed, 11 insertions, 1 deletions

diff --git a/lib/api/internal.rb b/lib/api/internal.rb
index 8cfa1f1556b..3ac7b50c4ce 100644
--- a/lib/api/internal.rb
+++ b/lib/api/internal.rb
@@ -23,7 +23,7 @@ module API
       end
 
       post "/allowed" do
-        Gitlab::Metrics.tag_transaction('action', 'Grape#/internal/allowed')
+        Gitlab::Metrics.action = 'Grape#/internal/allowed'
 
         status 200
 
diff --git a/lib/gitlab/gon_helper.rb b/lib/gitlab/gon_helper.rb
index ab900b641c4..9d81ffb3e6c 100644
--- a/lib/gitlab/gon_helper.rb
+++ b/lib/gitlab/gon_helper.rb
@@ -8,6 +8,7 @@ module Gitlab
       gon.relative_url_root      = Gitlab.config.gitlab.relative_url_root
       gon.shortcuts_path         = help_shortcuts_path
       gon.user_color_scheme      = Gitlab::ColorSchemes.for_user(current_user).css_class
+      gon.sentry_dsn             = ApplicationSetting.current.sentry_dsn if Rails.env.production?
 
       if current_user
         gon.current_user_id = current_user.id
diff --git a/lib/gitlab/metrics.rb b/lib/gitlab/metrics.rb
index f82dce14865..49f702f91f6 100644
--- a/lib/gitlab/metrics.rb
+++ b/lib/gitlab/metrics.rb
@@ -115,6 +115,15 @@ module Gitlab
       trans.add_tag(name, value) if trans
     end
 
+    # Sets the action of the current transaction (if any)
+    #
+    # action - The name of the action.
+    def self.action=(action)
+      trans = current_transaction
+
+      trans.action = action if trans
+    end
+
     # When enabled this should be set before being used as the usual pattern
     # "@foo ||= bar" is _not_ thread-safe.
     if enabled?