Merge branch 'rails5-fix-48141' into 'master'

Rails5 fix  expected: 0 times with any arguments received: 1 time with…

Closes #48141

See merge request gitlab-org/gitlab-ce!20018

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

changelogs/unreleased/rails5-fix-48141.yml

+---
+title: 'Rails5 fix  expected: 0 times with any arguments received: 1 time with arguments:
+  DashboardController'
+merge_request: 20018
+author: Jasper Maes
+type: fixed