mirrors/nyastodon
1
0
Fork 0
mirror of https://git.bsd.gay/fef/nyastodon.git synced 2024-12-30 21:13:47 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
nyastodon/config
History
Jeremy Kescher 24e9a23fe6
Merge remote-tracking branch 'upstream/main' into develop, bump version 
Conflicts:
- .github/workflows/build-image.yml
  We're not building an image with GitHub Actions.
2023-03-17 07:27:28 +01:00
..
environments Merge branch 'main' into glitch-soc/merge-upstream 2023-03-05 20:46:56 +01:00
initializers Merge remote-tracking branch 'upstream/main' into develop, bump version 2023-03-17 07:27:28 +01:00
locales Merge remote-tracking branch 'upstream/main' into develop, bump version 2023-03-17 07:27:28 +01:00
locales-glitch Merge remote-tracking branch 'upstream/main' into develop 2023-03-15 14:13:29 +01:00
webpack Merge branch 'main' into glitch-soc/merge-upstream 2023-02-13 19:35:35 +01:00
application.rb Address check-i18n warnings (#23313) 2023-02-02 10:14:19 +09: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 Fix pgBouncer resetting application name on every transaction (#23958) 2023-03-05 01:52:42 +01:00
deploy.rb Change master branch to main branch (#20290) 2022-11-10 04:02:05 +01:00
environment.rb Make PreviewCard records reuseable between statuses (#4642) 2017-09-01 16:20:16 +02:00
i18n-tasks.yml Merge branch 'main' into glitch-soc/merge-upstream 2023-01-18 17:38:11 +01:00
navigation.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-11-17 12:01:37 +01:00
pghero.yml Fix PgHero Content-Security-Policy when CDN_HOST is used (#13595) 2020-05-04 13:52:41 +02:00
puma.rb Support the PROXY protocol through the PROXY_PROTO_V1 env variable (#24064) 2023-03-14 14:47:57 +01:00
roles.yml Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
routes.rb Merge remote-tracking branch 'upstream/main' into develop, bump version 2023-03-17 07:27:28 +01:00
secrets.yml Upgrade to Rails 5.0.0.1 2016-08-17 17:58:00 +02:00
settings.yml Merge remote-tracking branch 'upstream/main' into develop 2023-01-18 22:29:27 +01:00
sidekiq.yml Merge remote-tracking branch 'upstream/main' into develop 2023-02-18 22:38:53 +01:00
storage.yml Update Mastodon to Rails 6.1 (#15910) 2021-03-24 10:44:31 +01:00
webpacker.yml Merge branch 'main' into glitch-soc/merge-upstream 2023-03-15 09:16:10 +01:00