diff options
author | Nick Thomas <nick@gitlab.com> | 2016-10-19 19:33:51 +0100 |
---|---|---|
committer | Nick Thomas <nick@gitlab.com> | 2016-10-20 12:24:27 +0100 |
commit | 61536ed2cff454bb2e3db8b7ca9ee09cc407461f (patch) | |
tree | 1dd1a551251e81799547b1ad8db1803a2e3db048 /app/models/merge_request.rb | |
parent | 6f846fcbe8fa129e240ae58c8d4bbb1e1a82bbef (diff) | |
download | gitlab-ce-61536ed2cff454bb2e3db8b7ca9ee09cc407461f.tar.gz |
Rename forked_source_project_missing? to source_project_missing?
Diffstat (limited to 'app/models/merge_request.rb')
-rw-r--r-- | app/models/merge_request.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 45fa8af60e5..c476a3bb14e 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -326,17 +326,17 @@ class MergeRequest < ActiveRecord::Base def validate_fork return true unless target_project && source_project return true if target_project == source_project - return true unless forked_source_project_missing? + return true unless source_project_missing? errors.add :validate_fork, 'Source project is not a fork of the target project' end def closed_without_fork? - closed? && forked_source_project_missing? + closed? && source_project_missing? end - def forked_source_project_missing? + def source_project_missing? return false unless for_fork? return true unless source_project |