diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-02-03 09:22:58 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-02-03 09:22:58 +0100 |
| commit | 369201a425f7b539290815402a4bc65923911e11 (patch) | |
| tree | 45de36cd6aa8c22aaf4be6cefaeeb70218d4daf5 /app/controllers | |
| parent | 4cd2d13bd226c005317adf9848f4c0316401b2ff (diff) | |
| parent | 3adc722d1cdd28d87d2724b8952d7ec52d241b52 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/api/v1/announcements_controller.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/app/controllers/api/v1/announcements_controller.rb b/app/controllers/api/v1/announcements_controller.rb index 6724fac2e..1e692ff75 100644 --- a/app/controllers/api/v1/announcements_controller.rb +++ b/app/controllers/api/v1/announcements_controller.rb @@ -19,11 +19,7 @@ class Api::V1::AnnouncementsController < Api::BaseController def set_announcements @announcements = begin - scope = Announcement.published - - scope.merge!(Announcement.without_muted(current_account)) unless truthy_param?(:with_dismissed) - - scope.chronological + Announcement.published.chronological end end |