Thibaut Girka 9adeaf2bfc Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- `app/controllers/statuses_controller.rb`:
  Minor conflict due to theming system

2020-01-24 14:37:06 +01:00

..

accounts

Merge branch 'master' into glitch-soc/merge-upstream

2020-01-04 23:04:42 +01:00

admin

…

announcements

Add announcements (#12662)

2020-01-23 22:00:13 +01:00

apps

…

instances

…

lists

…

polls

…

push

…

statuses

Hide blocked users from more places (#12733)

2019-12-31 00:55:32 +01:00

timelines

Fix tests being broken because of different default setting

2019-09-13 20:28:22 +02:00

accounts_controller_spec.rb

…

announcements_controller_spec.rb

Add announcements (#12662)

2020-01-23 22:00:13 +01:00

apps_controller_spec.rb

…

blocks_controller_spec.rb

…

bookmarks_controller_spec.rb

Support min_id-based pagination for bookmarks (#12381)

2019-11-17 17:09:41 +01:00

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)

2019-09-10 20:56:42 +02:00

instances_controller_spec.rb

…

lists_controller_spec.rb

…

markers_controller_spec.rb

Add timeline read markers API (#11762)

2019-09-06 13:55:51 +02:00

media_controller_spec.rb

…

mutes_controller_spec.rb

…

notifications_controller_spec.rb

…

polls_controller_spec.rb

…

reports_controller_spec.rb

…

statuses_controller_spec.rb

…

streaming_controller_spec.rb

…

suggestions_controller_spec.rb

…

trends_controller_spec.rb

Add announcements (#12662)

2020-01-23 22:00:13 +01:00