luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-04 14:04:39 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/config
History
Claire 8743b1ea40 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/admin/trends/links/index.html.haml`:
  Not really a conflict, upstream change textually too close to a glitch-soc
  change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming
  system).
  Ported upstream changes.
- `app/views/admin/trends/links/preview_card_providers/index.html.haml`:
  Not really a conflict, upstream change textually too close to a glitch-soc
  change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming
  system).
  Ported upstream changes.
- `app/views/admin/trends/statuses/index.html.haml`:
  Not really a conflict, upstream change textually too close to a glitch-soc
  change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming
  system).
  Ported upstream changes.
- `app/views/admin/trends/tags/index.html.haml`:
  Not really a conflict, upstream change textually too close to a glitch-soc
  change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming
  system).
  Ported upstream changes.
2022-03-02 20:48:27 +01:00
..
environments Merge branch 'main' into glitch-soc/merge-upstream 2022-01-28 08:58:32 +01:00
initializers Merge branch 'main' into glitch-soc/merge-upstream 2022-02-23 18:13:12 +01:00
locales Add descriptions to trending features in admin UI (#17677) 2022-03-02 18:57:44 +01:00
locales-glitch Add option (on by default) to allow toots with content warnings to trend 2022-02-26 10:46:26 +01:00
webpack Add support for multiple source files per pack 2022-02-12 00:10:28 +01:00
application.rb Add global locale param (#17464) 2022-02-08 02:34:56 +01:00
boot.rb Bump bootsnap from 1.6.0 to 1.8.1 (#16677) 2021-09-19 14:42:32 +09:00
brakeman.ignore Add trending statuses (#17431) 2022-02-25 00:34:14 +01:00
database.yml Escape database passwords in config/database.yml (#17627) 2022-02-25 01:16:52 +01:00
deploy.rb Change references to tootsuite/mastodon to mastodon/mastodon (#16491) 2021-07-13 15:46:20 +02:00
environment.rb
i18n-tasks.yml Merge branch 'main' into glitch-soc/merge-upstream 2022-02-23 18:13:12 +01:00
navigation.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-02-26 09:29:23 +01:00
pghero.yml
puma.rb
routes.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-03-02 18:02:48 +01:00
secrets.yml
settings.yml Add option (on by default) to allow toots with content warnings to trend 2022-02-26 10:46:26 +01:00
sidekiq.yml Change e-mail domain blocks to block IPs dynamically (#17635) 2022-02-24 17:28:23 +01:00
storage.yml Update Mastodon to Rails 6.1 (#15910) 2021-03-24 10:44:31 +01:00
webpacker.yml