diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 21:42:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 21:42:06 +0300 |
commit | 6e4e1050d9dba2b7b2523fdd1768823ab85feef4 (patch) | |
tree | 78be5963ec075d80116a932011d695dd33910b4e /app/finders/concerns/merged_at_filter.rb | |
parent | 1ce776de4ae122aba3f349c02c17cebeaa8ecf07 (diff) |
Add latest changes from gitlab-org/gitlab@13-3-stable-ee
Diffstat (limited to 'app/finders/concerns/merged_at_filter.rb')
-rw-r--r-- | app/finders/concerns/merged_at_filter.rb | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/app/finders/concerns/merged_at_filter.rb b/app/finders/concerns/merged_at_filter.rb new file mode 100644 index 00000000000..d2858ba2f88 --- /dev/null +++ b/app/finders/concerns/merged_at_filter.rb @@ -0,0 +1,33 @@ +# frozen_string_literal: true + +module MergedAtFilter + private + + # rubocop: disable CodeReuse/ActiveRecord + def by_merged_at(items) + return items unless merged_after || merged_before + + mr_metrics_scope = MergeRequest::Metrics + mr_metrics_scope = mr_metrics_scope.merged_after(merged_after) if merged_after.present? + mr_metrics_scope = mr_metrics_scope.merged_before(merged_before) if merged_before.present? + + scope = items.joins(:metrics).merge(mr_metrics_scope) + scope = target_project_id_filter_on_metrics(scope) if Feature.enabled?(:improved_mr_merged_at_queries) + scope + end + # rubocop: enable CodeReuse/ActiveRecord + + def merged_after + params[:merged_after] + end + + def merged_before + params[:merged_before] + end + + # rubocop: disable CodeReuse/ActiveRecord + def target_project_id_filter_on_metrics(scope) + scope.where(MergeRequest.arel_table[:target_project_id].eq(MergeRequest::Metrics.arel_table[:target_project_id])) + end + # rubocop: enable CodeReuse/ActiveRecord +end |