]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'main' into glitch-soc/merge-upstream
authorClaire <claire.github-309c@sitedethib.com>
Sat, 26 Feb 2022 08:29:23 +0000 (09:29 +0100)
committerClaire <claire.github-309c@sitedethib.com>
Sat, 26 Feb 2022 08:29:23 +0000 (09:29 +0100)
commitbe493b6c0d60778257cbd6247f9287f939fc7e4e
tree07c127fc0e059ccd185c40a3c4497706f3bcacc7
parente48eaf64cc7cb0cfab388331c4823ee5fb580d59
parenta5c24d5c4d75f3f3144f69c8f60f542707a82584
Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `app/models/account.rb`:
  Not a real conflict, just upstream getting rid of unused constants too close
  to glitch-soc-specific contents.
  Removed unused constants like upstream did.
- `app/models/trends.rb`:
  Conflict because glitch-soc disabled email notifications for trending links.
  Upstream has refactored this quite a bit and added trending posts.
  Took upstream code, but disabling the extra trending stuff will come in
  another commit.
- `app/views/admin/trends/links/index.html.haml`:
  Conflict due to glitch-soc's theming system.
  Ported upstream changes accordingly.
16 files changed:
Gemfile
Gemfile.lock
app/javascript/mastodon/features/compose/components/compose_form.js
app/javascript/styles/mastodon/components.scss
app/models/account.rb
app/models/status.rb
app/models/user.rb
app/policies/status_policy.rb
app/services/reblog_service.rb
app/views/admin/follow_recommendations/show.html.haml
app/views/admin/trends/links/index.html.haml
app/views/admin/trends/links/preview_card_providers/index.html.haml
app/views/admin/trends/tags/index.html.haml
config/navigation.rb
config/routes.rb
db/schema.rb