Add latest changes from gitlab-org/gitlab@14-10-stable-eev14.10.0-rc42

1 files changed, 7 insertions, 0 deletions

diff --git a/spec/controllers/projects/issues_controller_spec.rb b/spec/controllers/projects/issues_controller_spec.rb
index 9d3711d8a96..ce0af784cdf 100644
--- a/spec/controllers/projects/issues_controller_spec.rb
+++ b/spec/controllers/projects/issues_controller_spec.rb
@@ -148,6 +148,13 @@ RSpec.describe Projects::IssuesController do
         allow(Kaminari.config).to receive(:default_per_page).and_return(1)
       end
 
+      it 'redirects to last page when out of bounds on non-html requests' do
+        get :index, params: params.merge(page: last_page + 1), format: 'atom'
+
+        expect(response).to have_gitlab_http_status(:redirect)
+        expect(response).to redirect_to(action: 'index', format: 'atom', page: last_page, state: 'opened')
+      end
+
       it 'does not use pagination if disabled' do
         allow(controller).to receive(:pagination_disabled?).and_return(true)