diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-04-12 17:04:08 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-04-12 17:04:08 +0000 |
| commit | f5a3d8f75de50f0ac6a14e77c672da79df85866e (patch) | |
| tree | b0d3655e4a738867696e82cee07309b17e175531 /app/finders | |
| parent | 64f91be000bc2963a48851db4dcb0a6bbd2b57bc (diff) | |
| parent | eae2ed3366ac13832c56aefe965513b986d7e8b1 (diff) | |
| download | gitlab-ce-f5a3d8f75de50f0ac6a14e77c672da79df85866e.tar.gz | |
Merge branch 'dm-archived-read-only' into 'master'
Make archived projects completely read-only
Closes #44788
See merge request gitlab-org/gitlab-ce!18136
Diffstat (limited to 'app/finders')
| -rw-r--r-- | app/finders/merge_request_target_project_finder.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/finders/merge_request_target_project_finder.rb b/app/finders/merge_request_target_project_finder.rb index f358938344e..188ec447a94 100644 --- a/app/finders/merge_request_target_project_finder.rb +++ b/app/finders/merge_request_target_project_finder.rb @@ -12,6 +12,7 @@ class MergeRequestTargetProjectFinder if @source_project.fork_network @source_project.fork_network.projects .public_or_visible_to_user(current_user) + .non_archived .with_feature_available_for_user(:merge_requests, current_user) else Project.where(id: source_project) |