Commit 9b03f202 authored by Bob Van Landuyt's avatar Bob Van Landuyt

Remove deprecated `#forked_from?` check

I forgot to clean up this bit in we switched the `forked_from_project`
relation to use fork networks in
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22226
parent 1cd8fb49
...@@ -1445,11 +1445,6 @@ class Project < ApplicationRecord ...@@ -1445,11 +1445,6 @@ class Project < ApplicationRecord
end end
def in_fork_network_of?(other_project) def in_fork_network_of?(other_project)
# TODO: Remove this in a next release when all fork_networks are populated
# This makes sure all MergeRequests remain valid while the projects don't
# have a fork_network yet.
return true if forked_from?(other_project)
return false if fork_network.nil? || other_project.fork_network.nil? return false if fork_network.nil? || other_project.fork_network.nil?
fork_network == other_project.fork_network fork_network == other_project.fork_network
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment