Merge branch 'rails5-fix-6608' into 'master'

Rails5 fix ArgumentError: wrong number of arguments (given 1, expected 2)

Closes #6608

See merge request gitlab-org/gitlab-ee!6272

ee/changelogs/unreleased/rails5-fix-6608.yml

+---
+title: 'Rails5 fix ArgumentError: wrong number of arguments (given 1, expected 2)'
+merge_request: 6272
+author: Jasper Maes
+type: fixed

ee/spec/services/applications/create_service_spec.rb

@@ -3,8 +3,13 @@ require 'spec_helper'
 describe ::Applications::CreateService do
   let(:user) { create(:user) }
   let(:params) { attributes_for(:application) }
-  let(:request) { ActionController::TestRequest.new(remote_ip: '127.0.0.1') }
-
+  let(:request) do
+    if Gitlab.rails5?
+      ActionController::TestRequest.new({ remote_ip: "127.0.0.1" }, ActionController::TestSession.new)
+    else
+      ActionController::TestRequest.new(remote_ip: "127.0.0.1")
+    end
+  end
   subject { described_class.new(user, params) }
 
   it 'creates an audit log' do