]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'main' into glitch-soc/merge-upstream
authorClaire <claire.github-309c@sitedethib.com>
Thu, 17 Feb 2022 09:58:25 +0000 (10:58 +0100)
committerClaire <claire.github-309c@sitedethib.com>
Thu, 17 Feb 2022 09:58:44 +0000 (10:58 +0100)
commitf224237862b009ad4b008a8730c58111f103145b
tree097c08663c6348914fdf95d2ac9ce57ee2a3307c
parentec4f9066189fbab4368a275e9cd654dc7ad48217
parentac99f586bb4138e083676579097d951434e90515
Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `db/schema.rb`:
  Conflict due to glitch-soc adding the `content_type` column on status edits
  and thus having a different schema version number.
  Solved by taking upstream's schema version number, as it is higher than
  glitch-soc's.
20 files changed:
.github/workflows/build-image.yml
Gemfile
Gemfile.lock
Vagrantfile
app/controllers/auth/registrations_controller.rb
app/javascript/packs/public.js
app/javascript/styles/mastodon/admin.scss
app/lib/feed_manager.rb
app/models/account.rb
app/models/user.rb
app/views/admin/dashboard/index.html.haml
app/views/admin/reports/show.html.haml
app/views/layouts/public.html.haml
config/navigation.rb
config/routes.rb
config/settings.yml
db/schema.rb
package.json
streaming/index.js
yarn.lock