diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2019-07-01 08:00:49 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2019-07-01 08:00:49 +0000 |
| commit | bc3ffe835436a32ed46c39e385856cc6fc15db25 (patch) | |
| tree | b0c0bfc3aa0f0295b770ffbbc40961b0fc07790a | |
| parent | 7b1d9a159a302cfb5c6e82c8412eb7ece2e59931 (diff) | |
| parent | 9b03f202cada1c43ef4a4cc82a5df23633d4468d (diff) | |
| download | gitlab-ce-bc3ffe835436a32ed46c39e385856cc6fc15db25.tar.gz | |
Merge branch 'bvl-remove-old-fork-check' into 'master'
Remove deprecated `#forked_from?` check
See merge request gitlab-org/gitlab-ce!30132
| -rw-r--r-- | app/models/project.rb | 5 |
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 |