Commit e5e52996 authored by Max Woolf's avatar Max Woolf

Merge branch 'fix_atom_error_when_gitaly_unavailable' into 'master'

Don't return 500 error for tags in atom format

See merge request gitlab-org/gitlab!79483
parents 965fd314 3f0579e1
...@@ -31,6 +31,7 @@ class Projects::TagsController < Projects::ApplicationController ...@@ -31,6 +31,7 @@ class Projects::TagsController < Projects::ApplicationController
rescue Gitlab::Git::CommandError => e rescue Gitlab::Git::CommandError => e
@tags = [] @tags = []
@releases = []
@tags_loading_error = e @tags_loading_error = e
end end
......
...@@ -31,6 +31,7 @@ RSpec.describe Projects::TagsController do ...@@ -31,6 +31,7 @@ RSpec.describe Projects::TagsController do
get :index, params: { namespace_id: project.namespace.to_param, project_id: project }, format: format get :index, params: { namespace_id: project.namespace.to_param, project_id: project }, format: format
expect(assigns(:tags)).to eq([]) expect(assigns(:tags)).to eq([])
expect(assigns(:releases)).to eq([])
expect(response).to have_gitlab_http_status(:service_unavailable) expect(response).to have_gitlab_http_status(:service_unavailable)
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment