diff options
| author | Jasper Maes <jaspermaes.jm@gmail.com> | 2018-06-20 08:53:49 +0200 |
|---|---|---|
| committer | Jasper Maes <jaspermaes.jm@gmail.com> | 2018-06-20 10:59:34 +0200 |
| commit | ce30d14be5d9a403537a83dc005bee10e9825cea (patch) | |
| tree | 72396689e7552f5e72512fe93bbd1f8fd1efceb7 | |
| parent | f7b59b9f14014aab7d4d3e23e3565829d028c870 (diff) | |
| download | gitlab-ce-ce30d14be5d9a403537a83dc005bee10e9825cea.tar.gz | |
Rails5 fix expected: 0 times with any arguments received: 1 time with arguments: DashboardController
| -rw-r--r-- | app/controllers/dashboard_controller.rb | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/rails5-fix-48141.yml | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb index 68d328fa797..ff133001b84 100644 --- a/app/controllers/dashboard_controller.rb +++ b/app/controllers/dashboard_controller.rb @@ -54,7 +54,7 @@ class DashboardController < Dashboard::ApplicationController return unless @no_filters_set respond_to do |format| - format.html + format.html { render } format.atom { head :bad_request } end end diff --git a/changelogs/unreleased/rails5-fix-48141.yml b/changelogs/unreleased/rails5-fix-48141.yml new file mode 100644 index 00000000000..5e2aa23b8fb --- /dev/null +++ b/changelogs/unreleased/rails5-fix-48141.yml @@ -0,0 +1,6 @@ +--- +title: 'Rails5 fix expected: 0 times with any arguments received: 1 time with arguments: + DashboardController' +merge_request: 20018 +author: Jasper Maes +type: fixed |