diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-05 18:08:04 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-05 18:08:04 +0300 |
| commit | 63414b32fd0e75477285df4603e9f7b31dffa955 (patch) | |
| tree | fe6cb1ad5b1c8c4ddb4dc7300aa9f046b1c93fc2 /app/finders | |
| parent | 12b995e0e7aace4b7695c4424aed71b053c2c2a6 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/finders')
| -rw-r--r-- | app/finders/group_descendants_finder.rb | 2 | ||||
| -rw-r--r-- | app/finders/merge_request_target_project_finder.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/finders/group_descendants_finder.rb b/app/finders/group_descendants_finder.rb index 42cd06c8066..033af0f42a6 100644 --- a/app/finders/group_descendants_finder.rb +++ b/app/finders/group_descendants_finder.rb @@ -22,7 +22,7 @@ class GroupDescendantsFinder attr_reader :current_user, :parent_group, :params - def initialize(current_user: nil, parent_group:, params: {}) + def initialize(parent_group:, current_user: nil, params: {}) @current_user = current_user @parent_group = parent_group @params = params.reverse_merge(non_archived: params[:archived].blank?, not_aimed_for_deletion: true) diff --git a/app/finders/merge_request_target_project_finder.rb b/app/finders/merge_request_target_project_finder.rb index dc9b28ab0a0..fdb3bac8935 100644 --- a/app/finders/merge_request_target_project_finder.rb +++ b/app/finders/merge_request_target_project_finder.rb @@ -5,7 +5,7 @@ class MergeRequestTargetProjectFinder attr_reader :current_user, :source_project - def initialize(current_user: nil, source_project:, project_feature: :merge_requests) + def initialize(source_project:, current_user: nil, project_feature: :merge_requests) @current_user = current_user @source_project = source_project @project_feature = project_feature |