Add latest changes from gitlab-org/gitlab@master

2 files changed, 4 insertions, 2 deletions

diff --git a/app/models/concerns/prometheus_adapter.rb b/app/models/concerns/prometheus_adapter.rb
index df297017119..b85ac9ad4a6 100644
--- a/app/models/concerns/prometheus_adapter.rb
+++ b/app/models/concerns/prometheus_adapter.rb
@@ -49,7 +49,9 @@ module PrometheusAdapter
       query_class = query_klass_for(query_name)
       query_args = build_query_args(*args)
 
-      with_reactive_cache(query_class.name, *query_args, &query_class.method(:transform_reactive_result))
+      with_reactive_cache(query_class.name, *query_args) do |result|
+        query_class.transform_reactive_result(result)
+      end
     end
 
     # Cache metrics for specific environment
diff --git a/app/models/concerns/token_authenticatable.rb b/app/models/concerns/token_authenticatable.rb
index d91ec161b84..cc3e8f174b3 100644
--- a/app/models/concerns/token_authenticatable.rb
+++ b/app/models/concerns/token_authenticatable.rb
@@ -86,7 +86,7 @@ module TokenAuthenticatable
 
     def token_authenticatable_module
       @token_authenticatable_module ||=
-        const_set(:TokenAuthenticatable, Module.new).tap(&method(:include))
+        const_set(:TokenAuthenticatable, Module.new).tap { |mod| include mod }
     end
   end
 end