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	Add REST API for Web Push Notifications subscriptions (#7445)	2018-05-11 11:49:12 +02:00
statuses
timelines
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	Add more granular OAuth scopes (#7929)	2018-07-05 18:31:35 +02:00
bookmarks_controller_spec.rb
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
media_controller_spec.rb
mutes_controller_spec.rb
notifications_controller_spec.rb
polls_controller_spec.rb	Fix poll API not requiring authentication on non-public polls (#10960)	2019-06-04 20:10:26 +02:00
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