diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-01-17 10:45:25 +0100 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2022-01-17 10:45:25 +0100 |
commit | b3bf32a21e4dfc43737f50f15d3f258c16d0cf83 (patch) | |
tree | 37daa7d7725d3676115eea2c4d4a215bdd95c06d /app/models/report_filter.rb | |
parent | 430d4427916b44e6a7c16db1899dfef2eec140fc (diff) | |
parent | 14f436c457560862fafabd753eb314c8b8a8e674 (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/views/admin/reports/show.html.haml`: Conflicts due to glitch-soc's theming system.
Diffstat (limited to 'app/models/report_filter.rb')
-rw-r--r-- | app/models/report_filter.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/report_filter.rb b/app/models/report_filter.rb index a91a6baeb..dc444a552 100644 --- a/app/models/report_filter.rb +++ b/app/models/report_filter.rb @@ -19,7 +19,7 @@ class ReportFilter scope = Report.unresolved params.each do |key, value| - scope = scope.merge scope_for(key, value) + scope = scope.merge scope_for(key, value), rewhere: true end scope |