Commit edd04207 authored by GitLab Bot's avatar GitLab Bot

Add latest changes from gitlab-org/gitlab@master

parent 273c8f63
...@@ -239,8 +239,9 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do ...@@ -239,8 +239,9 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
end end
end end
resources :merge_requests, concerns: :awardable, except: [:new, :create], constraints: { id: /\d+/ } do resources :merge_requests, concerns: :awardable, except: [:new, :create, :show], constraints: { id: /\d+/ } do
member do member do
get :show # Insert this first to ensure redirections using merge_requests#show match this route
get :commit_change_content get :commit_change_content
post :merge post :merge
post :cancel_auto_merge post :cancel_auto_merge
......
...@@ -78,6 +78,40 @@ describe Projects::MergeRequestsController do ...@@ -78,6 +78,40 @@ describe Projects::MergeRequestsController do
expect(response).to be_successful expect(response).to be_successful
end end
end end
context 'when project has moved' do
let(:new_project) { create(:project) }
before do
project.route.destroy
new_project.redirect_routes.create!(path: project.full_path)
new_project.add_developer(user)
end
it 'redirects from an old merge request correctly' do
get :show,
params: {
namespace_id: project.namespace,
project_id: project,
id: merge_request
}
expect(response).to redirect_to(project_merge_request_path(new_project, merge_request))
expect(response).to have_gitlab_http_status(302)
end
it 'redirects from an old merge request commits correctly' do
get :commits,
params: {
namespace_id: project.namespace,
project_id: project,
id: merge_request
}
expect(response).to redirect_to(commits_project_merge_request_path(new_project, merge_request))
expect(response).to have_gitlab_http_status(302)
end
end
end end
context 'when user is setting notes filters' do context 'when user is setting notes filters' do
......
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