deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Intead of showing 404 give users ability to close MR with missing branches

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2013-03-20 20:22:29 +02:00
parent a0cc38827f
commit a163135cb5
6 changed files with 40 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/controllers/merge_requests_controller.rb
View file

@ -129,11 +129,11 @@ class MergeRequestsController < ProjectResourceController
def validates_merge_request
# Show git not found page if target branch doesn't exist
return git_not_found! unless @project.repo.heads.map(&:name).include?(@merge_request.target_branch)
return invalid_mr unless @project.repo.heads.map(&:name).include?(@merge_request.target_branch)
# Show git not found page if source branch doesn't exist
# and there is no saved commits between source & target branch
return git_not_found! if !@project.repo.heads.map(&:name).include?(@merge_request.source_branch) && @merge_request.commits.blank?
return invalid_mr if !@project.repo.heads.map(&:name).include?(@merge_request.source_branch) && @merge_request.commits.blank?
end
def define_show_vars
@ -158,4 +158,9 @@ class MergeRequestsController < ProjectResourceController
can?(current_user, action, @project)
end
def invalid_mr
# Render special view for MR with removed source or target branch
render 'invalid'
end
end