diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-10-30 04:17:53 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-10-30 04:17:53 +0000 |
| commit | 5a953741820b78492333e1543062a5c222694d8c (patch) | |
| tree | e3f0c8c4a6fee86ad8dd69cb583222bd06b22a18 | |
| parent | 67d97e3bcc6f4d96e5be1ce14dbcf5c132b1db64 (diff) | |
| parent | c11cb0b38f179fad4d7c4a6917f69cb10d1f762c (diff) | |
| download | gitlab-ce-5a953741820b78492333e1543062a5c222694d8c.tar.gz | |
Merge branch 'bw-fix-spec-in-merge' into 'master'
Fix problem with spec that showed up in EE merge
See merge request gitlab-org/gitlab-ce!22675
| -rw-r--r-- | spec/controllers/groups/boards_controller_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/controllers/groups/boards_controller_spec.rb b/spec/controllers/groups/boards_controller_spec.rb index d1d08391164..f7a4a4192d6 100644 --- a/spec/controllers/groups/boards_controller_spec.rb +++ b/spec/controllers/groups/boards_controller_spec.rb @@ -37,7 +37,7 @@ describe Groups::BoardsController do allow(visited).to receive(:board_id).and_return(12) allow_any_instance_of(Boards::Visits::LatestService).to receive(:execute).and_return(visited) - list_boards + list_boards format: :html expect(response).to render_template :index expect(response.content_type).to eq 'text/html' |