diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-03-08 20:22:54 +0100 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2022-03-08 20:22:54 +0100 |
commit | 1fbd1fa5c4ad5fcfef8af0c76f04e06f39aadd33 (patch) | |
tree | 1647c091e5d45d1d8dc20e6b25b3a588c2f8aa1b /app/workers/removal_worker.rb | |
parent | f03148f441d8dfc1856451c4faa00b5e26b6e199 (diff) | |
parent | 8f6c67bfdeddd1c2c1085067e3dc549fb53f6ff4 (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/controllers/settings/preferences_controller.rb`: Conflicts due to us having more user settings and upstream dropping `hide_network` (to replace it with an account attribute, properly migrated). Dropped `hide_network` like upstream. - `app/lib/user_settings_decorator.rb`: Conflicts due to us having more user settings and upstream dropping `hide_network` (to replace it with an account attribute, properly migrated). Dropped `hide_network` like upstream. - `app/models/status.rb`: Conflict because of slight change in how glitch-soc handles the scope to filter out local-only posts for anonymous viewers. Took upstream's changes and re-applied glitch-soc's change. - `app/models/user.rb`: Conflicts due to us having more user settings and upstream dropping `hide_network` (to replace it with an account attribute, properly migrated). Dropped `hide_network` like upstream. - `app/views/directories/index.html.haml`: Conflict because upstream redesigned that page while glitch-soc had a minor change to support hiding the number of followers. Ported glitch-soc's change on top of upstream's redesign. Additional changes: - `app/models/account_statuses_filter.rb`: See change to `app/models/status.rb`.
Diffstat (limited to 'app/workers/removal_worker.rb')
0 files changed, 0 insertions, 0 deletions