diff options
| author | ThibG <thib@sitedethib.com> | 2020-02-03 10:27:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-03 10:27:07 +0100 |
| commit | 94cdbc4982bde9709a633d26ff9a083dd9661258 (patch) | |
| tree | 66a2d3ef757eb5f7ed7b57a7dc215e77c0a18e97 /app/controllers | |
| parent | 4cd2d13bd226c005317adf9848f4c0316401b2ff (diff) | |
| parent | 3dcb279da31bc7810b7f58991dad4f886aaade34 (diff) | |
Merge pull request #1274 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
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 |