Add latest changes from gitlab-org/gitlab@15-3-stable-eev15.3.0-rc42

2 files changed, 6 insertions, 6 deletions

diff --git a/lib/gitlab/metrics/dashboard/url.rb b/lib/gitlab/metrics/dashboard/url.rb
index 6dcc73c0f6a..d4f779ad79d 100644
--- a/lib/gitlab/metrics/dashboard/url.rb
+++ b/lib/gitlab/metrics/dashboard/url.rb
@@ -42,7 +42,7 @@ module Gitlab
                   #{DASH_PATTERN}?
                   /grafana
                   /metrics_dashboard
-                }x
+                }xo
               )
             end
           end
@@ -64,7 +64,7 @@ module Gitlab
                   /(?<cluster_id>\d+)
                   /?
                   ( (/metrics) | ( /metrics_dashboard\.json ) )?
-                }x
+                }xo
               )
             end
           end
@@ -82,7 +82,7 @@ module Gitlab
                   /alerts
                   /(?<alert>\d+)
                   /metrics_dashboard(\.json)?
-                }x
+                }xo
               )
             end
           end
@@ -112,7 +112,7 @@ module Gitlab
               /environments
               /(?<environment>\d+)
               /(metrics_dashboard|metrics)
-            }x
+            }xo
           end
 
           def non_environment_metrics_regex
@@ -125,7 +125,7 @@ module Gitlab
                 environment=(?<environment>\d+)
                 .*
               )
-            }x
+            }xo
           end
 
           def regex_for_project_metrics(path_suffix_pattern)
diff --git a/lib/gitlab/metrics/methods/metric_options.rb b/lib/gitlab/metrics/methods/metric_options.rb
index 1e488df3e99..e93a90415c7 100644
--- a/lib/gitlab/metrics/methods/metric_options.rb
+++ b/lib/gitlab/metrics/methods/metric_options.rb
@@ -61,7 +61,7 @@ module Gitlab
         end
 
         def evaluate(&block)
-          instance_eval(&block) if block_given?
+          instance_eval(&block) if block
 
           self
         end