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 1ab12ba38e Merge remote-tracking branch 'origin/master' into merge-upstream 7 years ago
..
accounts Non-Serial ("Snowflake") IDs (#4801) 7 years ago
apps Fix #5104 - GET /api/v1/apps/verify_credentials to confirm app works (#5112) 7 years ago
lists Lists (#5703) 7 years ago
statuses Pinned statuses (#4675) 7 years ago
timelines Merge remote-tracking branch 'origin/master' into merge-upstream 7 years ago
accounts_controller.rb Updates per code review 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 Clean up for api/base controller (#3629) 7 years ago
favourites_controller.rb Merge queries in Api::V1::FavouritesController (#4359) 7 years ago
follow_requests_controller.rb Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090) 7 years ago
follows_controller.rb Fix POST /api/v1/follows error when already following (#4878) 7 years ago
instances_controller.rb Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090) 7 years ago
lists_controller.rb Lists (#5703) 7 years ago
media_controller.rb Add ability to specify alternative text for media attachments (#5123) 7 years ago
mutes_controller.rb Define a serializer for /api/v1/mutes/details 7 years ago
notifications_controller.rb New notification cleaning mode (#89) 7 years ago
reports_controller.rb Add moderator role and add pundit policies for admin actions (#5635) 7 years ago
search_controller.rb Merge tootsuite/master at 30237259367a0ef2b20908518b86bbeb358999b5 7 years ago
statuses_controller.rb Make PreviewCard records reuseable between statuses (#4642) 7 years ago
streaming_controller.rb Clean up for api/base controller (#3629) 7 years ago