Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43

1 files changed, 2 insertions, 6 deletions

diff --git a/lib/gitlab/metrics/dashboard/stages/grafana_formatter.rb b/lib/gitlab/metrics/dashboard/stages/grafana_formatter.rb
index c90c1e3f0bc..55d14d6f94a 100644
--- a/lib/gitlab/metrics/dashboard/stages/grafana_formatter.rb
+++ b/lib/gitlab/metrics/dashboard/stages/grafana_formatter.rb
@@ -104,9 +104,7 @@ module Gitlab
           def format_query(metric)
             expression = remove_new_lines(metric[:expr])
             expression = replace_variables(expression)
-            expression = replace_global_variables(expression, metric)
-
-            expression
+            replace_global_variables(expression, metric)
           end
 
           # Accomodates instance-defined Grafana variables.
@@ -135,9 +133,7 @@ module Gitlab
           def replace_global_variables(expression, metric)
             expression = expression.gsub('$__interval', metric[:interval]) if metric[:interval]
             expression = expression.gsub('$__from', query_params[:from])
-            expression = expression.gsub('$__to', query_params[:to])
-
-            expression
+            expression.gsub('$__to', query_params[:to])
           end
 
           # Removes new lines from expression.