Add latest changes from gitlab-org/gitlab@master

3 files changed, 20 insertions, 4 deletions

diff --git a/lib/gitlab/alerting/alert.rb b/lib/gitlab/alerting/alert.rb
index f6f52e392c6..7d97bd1bb52 100644
--- a/lib/gitlab/alerting/alert.rb
+++ b/lib/gitlab/alerting/alert.rb
@@ -21,6 +21,12 @@ module Gitlab
         end
       end
 
+      def gitlab_prometheus_alert_id
+        strong_memoize(:gitlab_prometheus_alert_id) do
+          payload&.dig('labels', 'gitlab_prometheus_alert_id')
+        end
+      end
+
       def title
         strong_memoize(:title) do
           gitlab_alert&.title || parse_title_from_payload
@@ -120,12 +126,19 @@ module Gitlab
       end
 
       def parse_gitlab_alert_from_payload
-        return unless metric_id
+        alerts_found = matching_gitlab_alerts
+
+        return if alerts_found.blank? || alerts_found.size > 1
+
+        alerts_found.first
+      end
+
+      def matching_gitlab_alerts
+        return unless metric_id || gitlab_prometheus_alert_id
 
         Projects::Prometheus::AlertsFinder
-          .new(project: project, metric: metric_id)
+          .new(project: project, metric: metric_id, id: gitlab_prometheus_alert_id)
           .execute
-          .first
       end
 
       def parse_title_from_payload
diff --git a/lib/gitlab/diff/highlight_cache.rb b/lib/gitlab/diff/highlight_cache.rb
index e79127108b4..055eae2c0fd 100644
--- a/lib/gitlab/diff/highlight_cache.rb
+++ b/lib/gitlab/diff/highlight_cache.rb
@@ -14,7 +14,7 @@ module Gitlab
 
       define_histogram :gitlab_redis_diff_caching_memory_usage_bytes do
         docstring 'Redis diff caching memory usage by key'
-        buckets [100, 1000, 10000, 100000, 1000000, 10000000]
+        buckets [100, 1_000, 10_000, 100_000, 1_000_000, 10_000_000]
       end
 
       define_counter :gitlab_redis_diff_caching_hit do
diff --git a/lib/gitlab/import_export/group/import_export.yml b/lib/gitlab/import_export/group/import_export.yml
index 49b9e0f83d9..5008639077c 100644
--- a/lib/gitlab/import_export/group/import_export.yml
+++ b/lib/gitlab/import_export/group/import_export.yml
@@ -36,6 +36,9 @@ excluded_attributes:
     - :runners_token_encrypted
     - :saml_discovery_token
     - :visibility_level
+    - :trial_ends_on
+    - :shared_runners_minute_limit
+    - :extra_shared_runners_minutes_limit
   epics:
     - :state_id