You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka ec49aa8175 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `.github/dependabot.yml`: Updated upstream, we deleted it to not be flooded by Depandabot. Kept deleted. - `Gemfile.lock`: Puma updated on both sides, went for the most recent version. - `app/controllers/api/v1/mutes_controller.rb`: Upstream updated the serializer to support timed mutes, while glitch-soc added a custom API ages ago to get information that is already available elsewhere. Dropped the glitch-soc-specific API, went with upstream changes. - `app/javascript/core/admin.js`: Conflict due to changing how assets are loaded. Went with upstream. - `app/javascript/packs/public.js`: Conflict due to changing how assets are loaded. Went with upstream. - `app/models/mute.rb`: 🤷 - `app/models/user.rb`: New user setting added upstream while we have glitch-soc-specific user settings. Added upstream's user setting. - `config/settings.yml`: Upstream added a new user setting close to a user setting we had changed the defaults for. Added the new upstream setting. - `package.json`: Upstream dependency updated “too close” to a glitch-soc-specific dependency. No real conflict. Updated the dependency.		5 years ago
..
accounts	Do not filter out temporarily-suspended accounts from relationships API	5 years ago
admin	Change account suspensions to be reversible by default (#14726)	5 years ago
announcements	Add announcements (#12662)	5 years ago
apps	Remove useless `respond_to` calls (#13208)	5 years ago
crypto	Make Array-creation behavior of Paginable more predictable (#14687)	5 years ago
featured_tags	Changed tag most_used to recently_used (#14760)	5 years ago
instances	Remove useless `respond_to` calls (#13208)	5 years ago
lists	Change REST API to return empty data for suspended accounts (#14765)	5 years ago
polls	Add more tests for ActivityPub controllers (#13585)	5 years ago
push	Fix not being able to enable status notifications in Web Push API (#14822)	5 years ago
statuses	Change REST API to return empty data for suspended accounts (#14765)	5 years ago
timelines	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
accounts_controller.rb	Add duration parameter to muting. (#13831)	5 years ago
announcements_controller.rb	Fix dismissing an announcement twice raising an obscure error (#13124)	5 years ago
apps_controller.rb	Add whitelist mode (#11291)	6 years ago
blocks_controller.rb	Change REST API to return empty data for suspended accounts (#14765)	5 years ago
bookmarks_controller.rb	Make Array-creation behavior of Paginable more predictable (#14687)	5 years ago
conversations_controller.rb	Make Array-creation behavior of Paginable more predictable (#14687)	5 years ago
custom_emojis_controller.rb	Remove useless `respond_to` calls (#13208)	5 years ago
directories_controller.rb	Add profile directory to web UI (#11688)	6 years ago
domain_blocks_controller.rb	Remove useless `respond_to` calls (#13208)	5 years ago
endorsements_controller.rb	Change REST API to return empty data for suspended accounts (#14765)	5 years ago
favourites_controller.rb	Make Array-creation behavior of Paginable more predictable (#14687)	5 years ago
featured_tags_controller.rb	Add featured tags API (#11778)	6 years ago
filters_controller.rb	Remove useless `respond_to` calls (#13208)	5 years ago
follow_requests_controller.rb	Add option to be notified when a followed user posts (#13546)	5 years ago
instances_controller.rb	Remove useless `respond_to` calls (#13208)	5 years ago
lists_controller.rb	Add configuration option to filter replies in lists (#9205)	5 years ago
markers_controller.rb	Add timeline read markers API (#11762)	6 years ago
media_controller.rb	Add customizable thumbnails for audio and video attachments (#14145)	5 years ago
mutes_controller.rb	Add duration parameter to muting. (#13831)	5 years ago
notifications_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
polls_controller.rb	Add more tests for ActivityPub controllers (#13585)	5 years ago
preferences_controller.rb	Remove useless `respond_to` calls (#13208)	5 years ago
reports_controller.rb	Add rate limit for reporting (#13390)	5 years ago
scheduled_statuses_controller.rb	Make Array-creation behavior of Paginable more predictable (#14687)	5 years ago
statuses_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
streaming_controller.rb	Remove useless `respond_to` calls (#13208)	5 years ago
suggestions_controller.rb	Remove useless `respond_to` calls (#13208)	5 years ago
trends_controller.rb	Remove useless `respond_to` calls (#13208)	5 years ago