Thibaut Girka 444796b69b Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/application_controller.rb - app/controllers/auth/confirmations_controller.rb - app/controllers/auth/sessions_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb		2019-07-23 10:51:07 +02:00
..
accounts
admin	Add moderation API (#9387)	2019-06-20 02:52:34 +02:00
apps
instances	Add (back) rails-level JSON caching (#11333)	2019-07-21 22:32:16 +02:00
lists
polls
push	Fix web push notifications for polls (#10864)	2019-05-28 00:26:08 +02:00
statuses
timelines	Remove deprecated REST API GET /api/v1/timelines/direct (#11212)	2019-07-05 02:14:56 +02:00
accounts_controller.rb
apps_controller.rb
blocks_controller.rb
bookmarks_controller.rb
conversations_controller.rb
custom_emojis_controller.rb	Add (back) rails-level JSON caching (#11333)	2019-07-21 22:32:16 +02:00
domain_blocks_controller.rb
endorsements_controller.rb
favourites_controller.rb
filters_controller.rb
follow_requests_controller.rb
instances_controller.rb	Add (back) rails-level JSON caching (#11333)	2019-07-21 22:32:16 +02:00
lists_controller.rb
media_controller.rb
mutes_controller.rb
notifications_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-23 19:01:30 +02:00
polls_controller.rb	Fix poll API not requiring authentication on non-public polls (#10960)	2019-06-04 20:10:26 +02:00
preferences_controller.rb
reports_controller.rb
scheduled_statuses_controller.rb
search_controller.rb	Add env variable to control search limit	2019-07-20 16:39:48 +02:00
statuses_controller.rb	Merge commit 'c07cca4727041ea5a5721acbc603d4bfb45a15a6' into glitch-soc/merge-upstream	2019-07-07 13:49:31 +02:00
streaming_controller.rb
suggestions_controller.rb