diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-01-27 13:38:01 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-01-27 13:38:01 +0300 |
| commit | 4676cf19a2fd6e1550b7be3260e47c7734ae7ba0 (patch) | |
| tree | f9ee3b9a67975466d42376c7995cea39399f85ae | |
| parent | 305270e864487d7b075088466ec72f7ae23b22db (diff) | |
| parent | b24ec3fb22e429eacb3d176b4b352869d1af8550 (diff) | |
Merge branch 'depr-devise-test-fixed' into 'master'
fix depr. warning; use `Devise::Test::ControllerHelpers`
Closes #26942
See merge request !8812
| -rw-r--r-- | spec/views/ci/lints/show.html.haml_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/views/ci/lints/show.html.haml_spec.rb b/spec/views/ci/lints/show.html.haml_spec.rb index 2dac5ee23c8..3390ae247ff 100644 --- a/spec/views/ci/lints/show.html.haml_spec.rb +++ b/spec/views/ci/lints/show.html.haml_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'ci/lints/show' do - include Devise::TestHelpers + include Devise::Test::ControllerHelpers describe 'XSS protection' do let(:config_processor) { Ci::GitlabCiYamlProcessor.new(YAML.dump(content)) } |