mirrors/nyastodon
1
0
Fork 0
mirror of https://git.bsd.gay/fef/nyastodon.git synced 2024-12-29 07:53:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
nyastodon/config
History
Claire 93912f0498 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/account.rb`:
  Conflict because we (glitch-soc) have disabled trending of posts without
  review.
  Discarded that upstream change.
- `app/views/admin/settings/discovery/show.html.haml`:
  Just an extra setting in glitch-soc.
  Kept that extra setting.
2022-11-12 13:28:03 +01:00
..
environments Merge branch 'main' into glitch-soc/merge-upstream 2022-11-12 13:28:03 +01:00
initializers Add “Glitch-only” label to glitch-specific settings 2022-11-12 11:30:35 +01:00
locales Revert "Revert "Change "Allow trends without prior review" setting to include statuses (#17977)"" 2022-11-12 10:17:22 +01:00
locales-glitch Add back missing glitch-soc admin settings (#1919) 2022-11-12 13:24:53 +01:00
webpack Merge branch 'main' into glitch-soc/merge-upstream 2022-08-28 11:31:00 +02:00
application.rb Fix mailers queue not being used for mailers (#20274) 2022-11-10 02:31:09 +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 Fix IDN domains not being rendered correctly in a few left-over places (#17848) 2022-03-22 10:07:11 +01:00
database.yml Format JSON and YAML using Prettier (#17823) 2022-03-21 04:46:11 +01:00
deploy.rb Change master branch to main branch (#20290) 2022-11-10 04:02:05 +01:00
environment.rb
i18n-tasks.yml Revert "Revert "Change "Allow trends without prior review" setting to include statuses (#17977)"" 2022-11-12 10:17:22 +01:00
navigation.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
pghero.yml
puma.rb
roles.yml Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
routes.rb Add back missing glitch-soc admin settings (#1919) 2022-11-12 13:24:53 +01:00
secrets.yml
settings.yml Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
sidekiq.yml Change incoming activity processing to happen in ingress queue (#20264) 2022-11-10 14:21:51 +01:00
storage.yml Update Mastodon to Rails 6.1 (#15910) 2021-03-24 10:44:31 +01:00
webpacker.yml