summaryrefslogtreecommitdiff
path: root/app/models/merge_request.rb
diff options
context:
space:
mode:
authorBob Van Landuyt <bob@vanlanduyt.co>2017-09-20 17:41:11 +0200
committerBob Van Landuyt <bob@vanlanduyt.co>2017-10-07 11:46:23 +0200
commit70716a1292ca5910908ba37a9d113c8b5a221bb7 (patch)
treeebff7a1289e85444170669761fcd2233a5757d54 /app/models/merge_request.rb
parentd328007214786c7137c31d2c73e9ee76b025e6ed (diff)
downloadgitlab-ce-70716a1292ca5910908ba37a9d113c8b5a221bb7.tar.gz
Allow creating merge requests across forks of a project
Diffstat (limited to 'app/models/merge_request.rb')
-rw-r--r--app/models/merge_request.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 086226618e6..9b312f7db6c 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -403,7 +403,7 @@ class MergeRequest < ActiveRecord::Base
return false unless for_fork?
return true unless source_project
- !source_project.forked_from?(target_project)
+ !source_project.in_fork_network_of?(target_project)
end
def reopenable?