kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'fix_500-commit-null' into 'master'

Browse source 
Don't try to mark broken MR as mergable

In case merge request is broken, we shouldn't check if the sha
is mergable, as it will be null, and there's no point, as we know
that it's not mergable.

See merge request !2783
This commit is contained in:
Douwe Maan 2016-02-12 17:40:40 +00:00
commit c142bde51d
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/merge_request.rb
View file

@ -241,7 +241,7 @@ class MergeRequest < ActiveRecord::Base
return unless unchecked? return unless unchecked?
can_be_merged = can_be_merged =
project.repository.can_be_merged?(source_sha, target_branch) !broken? && project.repository.can_be_merged?(source_sha, target_branch)
if can_be_merged if can_be_merged
mark_as_mergeable mark_as_mergeable