David Yip 514fc908a3 Merge tag 'v1.6.0rc3' into sync/upstream

2017-09-09 14:28:08 -05:00

..

accounts

authorize-follow-requests-after-unlocking (#4658)

2017-08-26 12:40:03 +02:00

statuses

Pinned statuses (#4675)

2017-08-25 01:41:18 +02:00

timelines

Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)

2017-07-07 04:02:06 +02:00

accounts_controller.rb

Fix #4794 - Fake instant follow in API response when account is believed unlocked (#4799)

2017-09-05 17:48:13 +02:00

apps_controller.rb

Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)

2017-07-07 04:02:06 +02:00

blocks_controller.rb

Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)

2017-07-07 04:02:06 +02:00

domain_blocks_controller.rb

Clean up for api/base controller (#3629)

2017-06-07 20:09:25 +02:00

favourites_controller.rb

Merge queries in Api::V1::FavouritesController (#4359)

2017-07-25 16:01:03 +02:00

follow_requests_controller.rb

Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)

2017-07-07 04:02:06 +02:00

follows_controller.rb

Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)

2017-07-07 04:02:06 +02:00

instances_controller.rb

Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)

2017-07-07 04:02:06 +02:00

media_controller.rb

Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)

2017-07-07 04:02:06 +02:00

mutes_controller.rb

Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)

2017-07-07 04:02:06 +02:00

notifications_controller.rb

New notification cleaning mode (#89)

2017-07-21 20:33:16 +02:00

reports_controller.rb

Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)

2017-07-07 04:02:06 +02:00

search_controller.rb

Raise search results count to 10 for test

2017-07-15 15:42:24 +02:00

statuses_controller.rb

Make PreviewCard records reuseable between statuses (#4642)

2017-09-01 16:20:16 +02:00

streaming_controller.rb

Clean up for api/base controller (#3629)

2017-06-07 20:09:25 +02:00