Thibaut Girka 3f60b096b5 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `config/routes.rb`: Upstream disabled E2EE routes, which we did earlier, but slightly differently. Took upstream's version.		2020-07-15 15:32:40 +02:00
..
accounts	Merge branch 'master' into glitch-soc/merge-upstream	2020-05-10 16:19:56 +02:00
admin
announcements
apps
instances
lists
polls
push
statuses	Fix being unable to unboost when blocked by their author (#14308)	2020-07-15 14:43:19 +02:00
timelines
accounts_controller_spec.rb	Bump doorkeeper from 5.3.3 to 5.4.0 (#13733)	2020-05-12 15:25:33 +02:00
announcements_controller_spec.rb
apps_controller_spec.rb
blocks_controller_spec.rb
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
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
reports_controller_spec.rb
statuses_controller_spec.rb
streaming_controller_spec.rb
suggestions_controller_spec.rb
trends_controller_spec.rb