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

Fix an issue with MR unavailable if remove source branch

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-04-19 23:06:45 +03:00
parent ac3c23f933
commit 45b18365d5
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/controllers/merge_requests_controller.rb
View file

@ -34,11 +34,14 @@ class MergeRequestsController < ApplicationController
end end
def show def show
unless @project.repo.heads.map(&:name).include?(@merge_request.target_branch) && # Show git not found page if target branch doesnt exist
@project.repo.heads.map(&:name).include?(@merge_request.source_branch) return git_not_found! unless @project.repo.heads.map(&:name).include?(@merge_request.target_branch)
git_not_found! and return
end
# Show git not found page if source branch doesnt 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?
# Build a note object for comment form
@note = @project.notes.new(:noteable => @merge_request) @note = @project.notes.new(:noteable => @merge_request)
# Get commits from repository # Get commits from repository