Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorKatarzyna Kobierska <kkobierska@gmail.com>2016-08-30 14:31:39 +0300
committerKatarzyna Kobierska <kkobierska@gmail.com>2016-08-30 14:31:39 +0300
commit2d8d94a788eb0bf3885ee67bda9638556425fa4b (patch)
treeb1849eaf7122ad597170eca05970cc7894a8b774 /app
parent7226631102ef00c2d880bc6c1e099e52f4fa8659 (diff)
Change method name
Diffstat (limited to 'app')
-rw-r--r--app/models/merge_request.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 27ca5d119d5..a8dd4a306cf 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -306,17 +306,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 fork_missing?
+ return true unless forked_source_project_missing?
errors.add :validate_fork,
'Source project is not a fork of the target project'
end
def closed_without_fork?
- closed? && fork_missing?
+ closed? && forked_source_project_missing?
end
- def fork_missing?
+ def forked_source_project_missing?
return false unless for_fork?
return true unless source_project