Add latest changes from gitlab-org/gitlab@master

3 files changed, 9 insertions, 1 deletions

diff --git a/lib/gitlab/alert_management/payload/base.rb b/lib/gitlab/alert_management/payload/base.rb
index 01dcb95eab5..5b136431ce7 100644
--- a/lib/gitlab/alert_management/payload/base.rb
+++ b/lib/gitlab/alert_management/payload/base.rb
@@ -181,7 +181,6 @@ module Gitlab
           end
         end
 
-        # Overriden in EE::Gitlab::AlertManagement::Payload::Generic
         def value_for_paths(paths)
           target_path = paths.find { |path| payload&.dig(*path) }
 
diff --git a/lib/gitlab/alert_management/payload/prometheus.rb b/lib/gitlab/alert_management/payload/prometheus.rb
index 4c36ebbf3aa..76f3da8366b 100644
--- a/lib/gitlab/alert_management/payload/prometheus.rb
+++ b/lib/gitlab/alert_management/payload/prometheus.rb
@@ -94,6 +94,10 @@ module Gitlab
           project && title && starts_at_raw
         end
 
+        def source
+          integration&.name || monitoring_tool
+        end
+
         private
 
         override :severity_mapping
@@ -131,3 +135,5 @@ module Gitlab
     end
   end
 end
+
+Gitlab::AlertManagement::Payload::Prometheus.prepend_mod
diff --git a/lib/sidebars/user_profile/panel.rb b/lib/sidebars/user_profile/panel.rb
index 9a595fdf64c..1852ef928f4 100644
--- a/lib/sidebars/user_profile/panel.rb
+++ b/lib/sidebars/user_profile/panel.rb
@@ -4,6 +4,9 @@ module Sidebars
   module UserProfile
     class Panel < ::Sidebars::Panel
       include UsersHelper
+      include Gitlab::Allowable
+
+      delegate :current_user, to: :@context
 
       override :configure_menus
       def configure_menus