Merge branch 'sh-fix-profiler-ruby-5.1' into 'master'28996-automatic-https-certificate-creation-renewal-for-pages-custom-domains-228996-automatic-https-certificate-creation-renewal-for-pages-custom-domains

Fix Profiler to work with Rails 5.1

Closes #61051

See merge request gitlab-org/gitlab-ce!27774

2 files changed, 4 insertions, 4 deletions

diff --git a/lib/gitlab/profiler.rb b/lib/gitlab/profiler.rb
index 28ed587f5c7..890228e5e78 100644
--- a/lib/gitlab/profiler.rb
+++ b/lib/gitlab/profiler.rb
@@ -73,7 +73,7 @@ module Gitlab
 
       result = with_custom_logger(logger) do
         with_user(user) do
-          RubyProf.profile { app.public_send(verb, url, post_data, headers) } # rubocop:disable GitlabSecurity/PublicSend
+          RubyProf.profile { app.public_send(verb, url, params: post_data, headers: headers) } # rubocop:disable GitlabSecurity/PublicSend
         end
       end
 
diff --git a/spec/lib/gitlab/profiler_spec.rb b/spec/lib/gitlab/profiler_spec.rb
index 9f2214f7ce7..5af52db7a1f 100644
--- a/spec/lib/gitlab/profiler_spec.rb
+++ b/spec/lib/gitlab/profiler_spec.rb
@@ -27,13 +27,13 @@ describe Gitlab::Profiler do
     it 'sends a POST request when data is passed' do
       post_data = '{"a":1}'
 
-      expect(app).to receive(:post).with(anything, post_data, anything)
+      expect(app).to receive(:post).with(anything, params: post_data, headers: anything)
 
       described_class.profile('/', post_data: post_data)
     end
 
     it 'uses the private_token for auth if given' do
-      expect(app).to receive(:get).with('/', nil, 'Private-Token' => private_token)
+      expect(app).to receive(:get).with('/', params: nil, headers: { 'Private-Token' => private_token })
       expect(app).to receive(:get).with('/api/v4/users')
 
       described_class.profile('/', private_token: private_token)
@@ -51,7 +51,7 @@ describe Gitlab::Profiler do
       user = double(:user)
 
       expect(described_class).to receive(:with_user).with(nil).and_call_original
-      expect(app).to receive(:get).with('/', nil, 'Private-Token' => private_token)
+      expect(app).to receive(:get).with('/', params: nil, headers: { 'Private-Token' => private_token })
       expect(app).to receive(:get).with('/api/v4/users')
 
       described_class.profile('/', user: user, private_token: private_token)