Merge branch 'mastodon-v3.1.2'
No related branches found
No related tags found
Showing
- CHANGELOG.md 26 additions, 0 deletionsCHANGELOG.md
- Dockerfile 16 additions, 5 deletionsDockerfile
- Gemfile 6 additions, 6 deletionsGemfile
- Gemfile.lock 20 additions, 22 deletionsGemfile.lock
- app/controllers/accounts_controller.rb 1 addition, 1 deletionapp/controllers/accounts_controller.rb
- app/controllers/api/v1/announcements_controller.rb 1 addition, 1 deletionapp/controllers/api/v1/announcements_controller.rb
- app/controllers/api/v1/statuses/bookmarks_controller.rb 10 additions, 17 deletionsapp/controllers/api/v1/statuses/bookmarks_controller.rb
- app/controllers/api/v1/statuses/favourited_by_accounts_controller.rb 1 addition, 2 deletions...lers/api/v1/statuses/favourited_by_accounts_controller.rb
- app/controllers/api/v1/statuses/favourites_controller.rb 9 additions, 17 deletionsapp/controllers/api/v1/statuses/favourites_controller.rb
- app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb 1 addition, 2 deletions...llers/api/v1/statuses/reblogged_by_accounts_controller.rb
- app/controllers/api/v1/statuses/reblogs_controller.rb 14 additions, 13 deletionsapp/controllers/api/v1/statuses/reblogs_controller.rb
- app/controllers/auth/registrations_controller.rb 1 addition, 2 deletionsapp/controllers/auth/registrations_controller.rb
- app/javascript/mastodon/base_polyfills.js 3 additions, 0 deletionsapp/javascript/mastodon/base_polyfills.js
- app/javascript/mastodon/components/error_boundary.js 22 additions, 3 deletionsapp/javascript/mastodon/components/error_boundary.js
- app/javascript/mastodon/load_polyfills.js 2 additions, 1 deletionapp/javascript/mastodon/load_polyfills.js
- app/javascript/mastodon/main.js 1 addition, 1 deletionapp/javascript/mastodon/main.js
- app/services/activitypub/process_account_service.rb 4 additions, 3 deletionsapp/services/activitypub/process_account_service.rb
- app/services/backup_service.rb 2 additions, 0 deletionsapp/services/backup_service.rb
- app/services/follow_service.rb 2 additions, 3 deletionsapp/services/follow_service.rb
- app/services/resolve_account_service.rb 1 addition, 1 deletionapp/services/resolve_account_service.rb
Loading
Please register or sign in to comment