Merge remote-tracking branch 'upstream/master'
No related branches found
No related tags found
Showing
- .circleci/config.yml 61 additions, 63 deletions.circleci/config.yml
- .codeclimate.yml 1 addition, 1 deletion.codeclimate.yml
- .env.production.sample 2 additions, 2 deletions.env.production.sample
- Gemfile 12 additions, 11 deletionsGemfile
- Gemfile.lock 81 additions, 74 deletionsGemfile.lock
- app/controllers/accounts_controller.rb 10 additions, 10 deletionsapp/controllers/accounts_controller.rb
- app/controllers/activitypub/collections_controller.rb 10 additions, 7 deletionsapp/controllers/activitypub/collections_controller.rb
- app/controllers/activitypub/outboxes_controller.rb 3 additions, 3 deletionsapp/controllers/activitypub/outboxes_controller.rb
- app/controllers/activitypub/replies_controller.rb 15 additions, 6 deletionsapp/controllers/activitypub/replies_controller.rb
- app/controllers/api/v1/accounts/follower_accounts_controller.rb 1 addition, 1 deletion...ntrollers/api/v1/accounts/follower_accounts_controller.rb
- app/controllers/api/v1/accounts/following_accounts_controller.rb 1 addition, 1 deletion...trollers/api/v1/accounts/following_accounts_controller.rb
- app/controllers/api/v1/polls/votes_controller.rb 1 addition, 1 deletionapp/controllers/api/v1/polls/votes_controller.rb
- app/controllers/api/v1/polls_controller.rb 1 addition, 1 deletionapp/controllers/api/v1/polls_controller.rb
- app/controllers/api/v1/push/subscriptions_controller.rb 6 additions, 5 deletionsapp/controllers/api/v1/push/subscriptions_controller.rb
- app/controllers/api/v1/statuses/mutes_controller.rb 1 addition, 2 deletionsapp/controllers/api/v1/statuses/mutes_controller.rb
- app/controllers/api/v1/statuses_controller.rb 1 addition, 1 deletionapp/controllers/api/v1/statuses_controller.rb
- app/controllers/api/v1/timelines/public_controller.rb 2 additions, 2 deletionsapp/controllers/api/v1/timelines/public_controller.rb
- app/controllers/auth/sessions_controller.rb 7 additions, 0 deletionsapp/controllers/auth/sessions_controller.rb
- app/controllers/media_controller.rb 1 addition, 1 deletionapp/controllers/media_controller.rb
- app/controllers/remote_interaction_controller.rb 1 addition, 1 deletionapp/controllers/remote_interaction_controller.rb
Loading
Please register or sign in to comment