]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'main' into glitch-soc/merge-upstream
authorClaire <claire.github-309c@sitedethib.com>
Sun, 23 Jan 2022 17:13:55 +0000 (18:13 +0100)
committerClaire <claire.github-309c@sitedethib.com>
Sun, 23 Jan 2022 17:24:01 +0000 (18:24 +0100)
commit61ef81c548a0140a80281d4004ac55873d8f74d6
tree770c251059d139243b9cb557c762648e0af55037
parent4d0383d75ac606f8c9c2b8ecb0ea2dddf28213cb
parent0a120d86d28e3f2e20455f56c1656f5d5f2f4af6
Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `spec/models/status_spec.rb`:
  Upstream added tests too close to glitch-soc-specific tests.
  Kept both tests.
app/controllers/auth/registrations_controller.rb
app/controllers/auth/sessions_controller.rb
app/helpers/application_helper.rb
app/javascript/mastodon/features/compose/components/compose_form.js
app/models/account.rb
app/models/status.rb
app/models/user.rb
app/views/layouts/public.html.haml
app/views/statuses/_simple_status.html.haml
db/schema.rb
spec/models/status_spec.rb