Automatic merge of gitlab-org/gitlab-ce master

spec/lib/gitlab/request_context_spec.rb

@@ -25,7 +25,7 @@ describe Gitlab::RequestContext do
           [200, {}, ["Hello"]]
         end
 
-        Rails.application.middleware.build(endpoint).call(env)
+        described_class.new(endpoint).call(env)
 
         expect(client_ip).to eq(load_balancer_ip)
       end