diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2018-09-28 11:00:30 +0200 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2018-09-28 11:09:55 +0200 |
| commit | 3c2d6b4870afa9cae25007a2ccf90ebf92c37d42 (patch) | |
| tree | 475015e2404da84793d1bdadc226fcd1bed28c11 /app/services/merge_requests/base_service.rb | |
| parent | ba66e0cc9cc26df686ed47d926a3edcde497baa1 (diff) | |
| download | gitlab-ce-3c2d6b4870afa9cae25007a2ccf90ebf92c37d42.tar.gz | |
Add a class that represents a git push operation
Diffstat (limited to 'app/services/merge_requests/base_service.rb')
| -rw-r--r-- | app/services/merge_requests/base_service.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/services/merge_requests/base_service.rb b/app/services/merge_requests/base_service.rb index aa5d8406d0f..28c3219b37b 100644 --- a/app/services/merge_requests/base_service.rb +++ b/app/services/merge_requests/base_service.rb @@ -57,10 +57,10 @@ module MergeRequests # Returns all origin and fork merge requests from `@project` satisfying passed arguments. # rubocop: disable CodeReuse/ActiveRecord def merge_requests_for(source_branch, mr_states: [:opened]) - MergeRequest + @project.source_of_merge_requests .with_state(mr_states) - .where(source_branch: source_branch, source_project_id: @project.id) - .preload(:source_project) # we don't need a #includes since we're just preloading for the #select + .where(source_branch: source_branch) + .preload(:source_project) # we don't need #includes since we're just preloading for the #select .select(&:source_project) end # rubocop: enable CodeReuse/ActiveRecord |