Automatic merge of gitlab-org/gitlab-ce master

config/initializers/rack_attack_logging.rb

@@ -12,7 +12,7 @@ ActiveSupport::Notifications.subscribe('rack.attack') do |name, start, finish, r
       fullpath: req.fullpath
     }
 
-    if req.env['rack.attack.matched'] != 'throttle_unauthenticated'
+    if %w(throttle_authenticated_api throttle_authenticated_web).include? req.env['rack.attack.matched']
       user_id = req.env['rack.attack.match_discriminator']
       user = User.find_by(id: user_id)
 

lib/gitlab/gon_helper.rb

@@ -38,6 +38,11 @@ module Gitlab
         gon.current_user_fullname = current_user.name
         gon.current_user_avatar_url = current_user.avatar_url
       end
+
+      # Flag controls a GFM feature used across many routes.
+      # Pushing the flag from one place simplifies control
+      # and facilitates easy removal.
+      push_frontend_feature_flag(:gfm_embedded_metrics)
     end
 
     # Exposes the state of a feature flag to the frontend code.