You can not 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 9adeaf2bfc Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/statuses_controller.rb`: Minor conflict due to theming system		5 years ago
..
accounts	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
admin	…
announcements	Add announcements (#12662)	5 years ago
apps	…
instances	…
lists	…
polls	…
push	…
statuses	Hide blocked users from more places (#12733)	5 years ago
timelines	Fix tests being broken because of different default setting	5 years ago
accounts_controller_spec.rb	…
announcements_controller_spec.rb	Add announcements (#12662)	5 years ago
apps_controller_spec.rb	…
blocks_controller_spec.rb	…
bookmarks_controller_spec.rb	Support min_id-based pagination for bookmarks (#12381)	5 years ago
conversations_controller_spec.rb	…
custom_emojis_controller_spec.rb	…
domain_blocks_controller_spec.rb	…
endorsements_controller_spec.rb	…
favourites_controller_spec.rb	…
filters_controller_spec.rb	…
follow_requests_controller_spec.rb	Add updated relationship to follow request API responses (#11800)	5 years ago
instances_controller_spec.rb	…
lists_controller_spec.rb	…
markers_controller_spec.rb	Add timeline read markers API (#11762)	5 years ago
media_controller_spec.rb	…
mutes_controller_spec.rb	…
notifications_controller_spec.rb	…
polls_controller_spec.rb	…
reports_controller_spec.rb	…
statuses_controller_spec.rb	Remove deprecated REST API `GET /api/v1/statuses/:id/card` (#11213)	6 years ago
streaming_controller_spec.rb	…
suggestions_controller_spec.rb	…
trends_controller_spec.rb	Add announcements (#12662)	5 years ago