]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Wed, 24 Jun 2020 13:33:41 +0000 (15:33 +0200)
committerThibaut Girka <thib@sitedethib.com>
Wed, 24 Jun 2020 13:33:41 +0000 (15:33 +0200)
commitaae60a2366d6dadbcc4a0197d4dd17afc931c8a0
tree0bbbc278809d9990365a2d79abeaf02891990d51
parent5d12b63e79953a7596ae473706985b774d4e51a6
parentbb9ca8a587ee5a3ec8778e72828aca0ba8871327
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `app/controllers/concerns/sign_in_token_authentication_concern.rb`:
  Conflict due to glitch-soc's theming system.
  Ported upstream changes.
- `app/controllers/concerns/two_factor_authentication_concern.rb`:
  Conflict due to glitch-soc's theming system.
  Ported upstream changes.
15 files changed:
Gemfile.lock
app/controllers/accounts_controller.rb
app/controllers/concerns/sign_in_token_authentication_concern.rb
app/controllers/concerns/two_factor_authentication_concern.rb
app/controllers/directories_controller.rb
app/controllers/follower_accounts_controller.rb
app/controllers/following_accounts_controller.rb
app/controllers/remote_interaction_controller.rb
app/controllers/statuses_controller.rb
app/controllers/tags_controller.rb
app/javascript/styles/mastodon/components.scss
app/lib/feed_manager.rb
db/schema.rb
package.json
yarn.lock