diff options
| author | Phil Hughes <me@iamphill.com> | 2016-10-03 09:10:20 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-10-03 09:10:20 +0100 |
| commit | cc88fa4d5be9ec0d5fb42f1bb5efa0b82f30a589 (patch) | |
| tree | 1b9facaf15466aa7f5b0393e97cb1eabfdcafa7e /spec/views/admin/dashboard/index.html.haml_spec.rb | |
| parent | 69db604e55de2bdf1a28c274be6cc9131534517d (diff) | |
| parent | f2c0f8237124d2dc539120bd77f301f216453cb7 (diff) | |
| download | gitlab-ce-cc88fa4d5be9ec0d5fb42f1bb5efa0b82f30a589.tar.gz | |
Merge branch 'master' into revert-c676283b
Diffstat (limited to 'spec/views/admin/dashboard/index.html.haml_spec.rb')
| -rw-r--r-- | spec/views/admin/dashboard/index.html.haml_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/views/admin/dashboard/index.html.haml_spec.rb b/spec/views/admin/dashboard/index.html.haml_spec.rb index dae858a52f6..68d2d72876e 100644 --- a/spec/views/admin/dashboard/index.html.haml_spec.rb +++ b/spec/views/admin/dashboard/index.html.haml_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'admin/dashboard/index.html.haml' do - include Devise::TestHelpers + include Devise::Test::ControllerHelpers before do assign(:projects, create_list(:empty_project, 1)) |