Merge branch 'patch-2' of https://github.com/zzet/gitlabhq into zzet-patch-2

Conflicts:
	app/controllers/projects/merge_requests_controller.rb

diff --cc app/controllers/projects/merge_requests_controller.rb
index 3bc50b0,d07fa8c..0cc09ca
--- 1/app/controllers/projects/merge_requests_controller.rb
--- 2/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@@ -157,12 -122,16 +157,15 @@@ class Projects::MergeRequestsControlle
    end
  
    def validates_merge_request
-     # Show git not found page if target branch doesn't exist
-     return invalid_mr unless @merge_request.target_project.repository.branch_names.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 invalid_mr if !@merge_request.source_project.repository.branch_names.include?(@merge_request.source_branch) && @merge_request.commits.blank?
+     # Show git not found page
+     # if there is no saved commits between source & target branch
+     if @merge_request.commits.blank?
 -       # and
 -       # if source target doesn't exist
 -       return invalid_mr if !@project.repository.branch_names.include?(@merge_request.target_branch)
++       # and if source target doesn't exist
++       return invalid_mr unless @merge_request.target_project.repository.branch_names.include?(@merge_request.target_branch)
+ 
+        # or if source branch doesn't exist
 -       return invalid_mr if !@project.repository.branch_names.include?(@merge_request.source_branch)
++       return invalid_mr unless @merge_request.source_project.repository.branch_names.include?(@merge_request.source_branch)
+     end
    end
  
    def define_show_vars