Add latest changes from gitlab-org/gitlab@master

1 files changed, 2 insertions, 0 deletions

diff --git a/spec/controllers/concerns/continue_params_spec.rb b/spec/controllers/concerns/continue_params_spec.rb
index c010e8ffbd0..ba600b8156a 100644
--- a/spec/controllers/concerns/continue_params_spec.rb
+++ b/spec/controllers/concerns/continue_params_spec.rb
@@ -4,6 +4,7 @@ require 'spec_helper'
 
 RSpec.describe ContinueParams do
   let(:controller_class) do
+    # rubocop:disable Rails/ApplicationController
     Class.new(ActionController::Base) do
       include ContinueParams
 
@@ -11,6 +12,7 @@ RSpec.describe ContinueParams do
         @request ||= Struct.new(:host, :port).new('test.host', 80)
       end
     end
+    # rubocop:enable Rails/ApplicationController
   end
 
   subject(:controller) { controller_class.new }