Commit bc3ffe83 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'bvl-remove-old-fork-check' into 'master'

Remove deprecated `#forked_from?` check

See merge request gitlab-org/gitlab-ce!30132
parents 7b1d9a15 9b03f202
......@@ -1445,11 +1445,6 @@ class Project < ApplicationRecord
end
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?
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