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

[Rails5] fix Boards::ListsController expected the response to have status code 200 but it was 403

Closes #6746

See merge request gitlab-org/gitlab-ee!6318

ee/changelogs/unreleased/rails5-fix-6746.yml

+---
+title: "[Rails5] fix Boards::ListsController expected the response to have status
+  code 200 but it was 403"
+merge_request: 6318
+author: Jasper Maes
+type: fixed

ee/spec/controllers/boards/lists_controller_spec.rb

@@ -149,11 +149,18 @@ describe Boards::ListsController do
 
     def move(user:, board:, list:, position:)
       sign_in(user)
-
-      patch :update, board_id: board.to_param,
-                     id: list.to_param,
-                     list: { position: position },
-                     format: :json
+      params = {
+        board_id: board.to_param,
+        id: list.to_param,
+        list: { position: position },
+        format: :json
+      }
+
+      if Gitlab.rails5?
+        patch :update, params: params, as: :json
+      else
+        patch :update, params
+      end
     end
   end