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.

David Yip 4cca1d1e7e Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/auth/confirmations_controller.rb		7 years ago
..
accounts	Fix #5953 - Add GET /api/v1/accounts/:id/lists (#5983)	7 years ago
apps	Fix #5104 - GET /api/v1/apps/verify_credentials to confirm app works (#5112)	7 years ago
instances	Add more instance stats APIs (#6125)	7 years ago
lists	Add list of lists component to web UI (#5811)	7 years ago
statuses	…
timelines	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
accounts_controller.rb	Using double splat operator (#5859)	7 years ago
apps_controller.rb	Fix #5104 - GET /api/v1/apps/verify_credentials to confirm app works (#5112)	7 years ago
blocks_controller.rb	Fix pagination in Api::V1::BlocksController (#5285)	7 years ago
custom_emojis_controller.rb	Improve admin UI for custom emojis, add copy/disable/enable (#5231)	7 years ago
domain_blocks_controller.rb	…
favourites_controller.rb	…
follow_requests_controller.rb	…
follows_controller.rb	…
instances_controller.rb	…
lists_controller.rb	Limit users to 50 lists, remove pagination from lists API (#5933)	7 years ago
media_controller.rb	Add ability to specify alternative text for media attachments (#5123)	7 years ago
mutes_controller.rb	…
notifications_controller.rb	…
reports_controller.rb	Add moderator role and add pundit policies for admin actions (#5635)	7 years ago
search_controller.rb	Merge tootsuite/master at 3023725936	7 years ago
statuses_controller.rb	…
streaming_controller.rb	…