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.
Ondřej Hruška 0cc795db6b
Merge commit '9ab3021562565eeee27820438f32b764414f5ab1' into merging-upstream
7 years ago
..
accounts authorize-follow-requests-after-unlocking (#4658) 7 years ago
statuses Pinned statuses (#4675) 7 years ago
timelines Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090) 7 years ago
accounts_controller.rb Fix error when following locked accounts (#4896) 7 years ago
apps_controller.rb Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090) 7 years ago
blocks_controller.rb Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090) 7 years ago
custom_emojis_controller.rb New API: GET /api/v1/custom_emojis to get a server's custom emojis (#5051) 7 years ago
domain_blocks_controller.rb Clean up for api/base controller (#3629) 8 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
media_controller.rb Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090) 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 Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090) 7 years ago
search_controller.rb Raise search results count to 10 for test 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) 8 years ago