diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-11-03 18:33:53 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-11-03 18:33:53 +0300 |
| commit | e19f54ca41f094920bccdecc6f2b82b8dda2f4e7 (patch) | |
| tree | 7cbf497b8f158dfe03ae68d762abfb07a98880c3 /app/models | |
| parent | 9f07033839e2c5fdb6ab429cbafab56d6f46b007 (diff) | |
| parent | 0f1d6402b9ebf25d5ddd09effe6dce1902ae476b (diff) | |
Merge branch 'bvl-unlink-fixes' into 'master'
This fixes some bugs related to forked projects of which the source was deleted.
Closes #39667
See merge request gitlab-org/gitlab-ce!15150
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/fork_network.rb | 4 | ||||
| -rw-r--r-- | app/models/project.rb | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/app/models/fork_network.rb b/app/models/fork_network.rb index 218e37a5312..7f1728e8c77 100644 --- a/app/models/fork_network.rb +++ b/app/models/fork_network.rb @@ -12,4 +12,8 @@ class ForkNetwork < ActiveRecord::Base def find_forks_in(other_projects) projects.where(id: other_projects) end + + def merge_requests + MergeRequest.where(target_project: projects) + end end diff --git a/app/models/project.rb b/app/models/project.rb index 413866b994a..2f9b80d0514 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -1040,6 +1040,10 @@ class Project < ActiveRecord::Base !(forked_project_link.nil? || forked_project_link.forked_from_project.nil?) end + def fork_source + forked_from_project || fork_network&.root_project + end + def personal? !group end |