]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Tue, 23 Jul 2019 08:17:06 +0000 (10:17 +0200)
committerThibaut Girka <thib@sitedethib.com>
Tue, 23 Jul 2019 08:51:07 +0000 (10:51 +0200)
commit444796b69b0cd2c7b4b95d3b3119e0b7a503f682
tree6607b9d27817f66a1395bcfaea609198015f8973
parent6db5669818cce459b9bb916665541b7b8f5d5155
parentab3126e7a23125b033ec198cfd83c2178338442c
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- app/controllers/application_controller.rb
- app/controllers/auth/confirmations_controller.rb
- app/controllers/auth/sessions_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
26 files changed:
Gemfile
Gemfile.lock
app/controllers/about_controller.rb
app/controllers/accounts_controller.rb
app/controllers/application_controller.rb
app/controllers/auth/confirmations_controller.rb
app/controllers/auth/registrations_controller.rb
app/controllers/auth/sessions_controller.rb
app/controllers/oauth/authorized_applications_controller.rb
app/controllers/settings/deletes_controller.rb
app/controllers/settings/sessions_controller.rb
app/controllers/settings/two_factor_authentication/confirmations_controller.rb
app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
app/controllers/settings/two_factor_authentications_controller.rb
app/controllers/statuses_controller.rb
app/javascript/packs/public.js
app/javascript/styles/mastodon/admin.scss
app/lib/formatter.rb
app/models/concerns/account_associations.rb
app/models/user.rb
config/locales/en.yml
config/routes.rb
db/schema.rb
package.json
spec/controllers/application_controller_spec.rb
yarn.lock