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

17
app/views/merge_requests/invalid.html.haml Normal file
View file

@ -0,0 +1,17 @@
.merge-request
= render "merge_requests/show/mr_title"
= render "merge_requests/show/mr_box"
.alert.alert-error
%h5
%i.icon-exclamation-sign
We cannot find
%span.label-branch= @merge_request.source_branch
or
%span.label-branch= @merge_request.target_branch
branches in the repository.
%p
Maybe it was removed or never pushed.
%p
Please close Merge Request or change branches with existing one

4
app/views/merge_requests/show/_mr_title.html.haml
View file

@ -1,9 +1,9 @@
%h3.page_title
= "Merge Request ##{@merge_request.id}:"
 
%span.label_branch= @merge_request.source_branch
%span.label-branch= @merge_request.source_branch
→
%span.label_branch= @merge_request.target_branch
%span.label-branch= @merge_request.target_branch
%span.pull-right
- if can?(current_user, :modify_merge_request, @merge_request)