Merge tag 'v4.2.6' into tedomum
No related branches found
No related tags found
Checking pipeline status
Showing
- CHANGELOG.md 19 additions, 0 deletionsCHANGELOG.md
- Gemfile.lock 7 additions, 7 deletionsGemfile.lock
- app/controllers/auth/omniauth_callbacks_controller.rb 1 addition, 1 deletionapp/controllers/auth/omniauth_callbacks_controller.rb
- app/lib/application_extension.rb 20 additions, 0 deletionsapp/lib/application_extension.rb
- app/models/concerns/omniauthable.rb 38 additions, 14 deletionsapp/models/concerns/omniauthable.rb
- app/models/identity.rb 1 addition, 1 deletionapp/models/identity.rb
- app/models/user.rb 10 additions, 0 deletionsapp/models/user.rb
- config/initializers/doorkeeper.rb 7 additions, 2 deletionsconfig/initializers/doorkeeper.rb
- config/routes.rb 1 addition, 1 deletionconfig/routes.rb
- docker-compose.yml 3 additions, 3 deletionsdocker-compose.yml
- lib/mastodon/version.rb 1 addition, 1 deletionlib/mastodon/version.rb
- lib/tasks/sidekiq_unique_jobs.rake 11 additions, 0 deletionslib/tasks/sidekiq_unique_jobs.rake
- spec/models/identity_spec.rb 3 additions, 3 deletionsspec/models/identity_spec.rb
- spec/models/user_spec.rb 7 additions, 0 deletionsspec/models/user_spec.rb
- spec/requests/disabled_oauth_endpoints_spec.rb 83 additions, 0 deletionsspec/requests/disabled_oauth_endpoints_spec.rb
- spec/requests/omniauth_callbacks_spec.rb 1 addition, 1 deletionspec/requests/omniauth_callbacks_spec.rb
Loading
Please register or sign in to comment