summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Van Landuyt <bob@vanlanduyt.co>2019-06-27 18:03:57 +0200
committerBob Van Landuyt <bob@vanlanduyt.co>2019-06-28 20:15:35 +0200
commit9b03f202cada1c43ef4a4cc82a5df23633d4468d (patch)
tree6e8710078945ce597a6f47efdb6930046396076d
parent1cd8fb49f9b9150faf50767edbdfb564fde8576b (diff)
downloadgitlab-ce-9b03f202cada1c43ef4a4cc82a5df23633d4468d.tar.gz
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
-rw-r--r--app/models/project.rb5
1 files changed, 0 insertions, 5 deletions
diff --git a/app/models/project.rb b/app/models/project.rb
index b102e0580e7..0f4fba5d0b6 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -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