me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
glitchier-soc/config
History
Claire 2aaf3528ca Merge commit 'd548faf69321260ab4c2a16759ca77773189126a' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/styles/mastodon/forms.scss`:
  Conflict because we ran eslint autofix on upstream files.
- `config/initializers/content_security_policy.rb`:
  Code style changes but we have a different version.
  Kept our version.
- `streaming/index.js`:
  Upstream fixed a typo close to glitch-soc-only code.
  Applied upstream's changes.
2023-05-08 15:28:36 +02:00
..
environments Merge commit 'd548faf69321260ab4c2a16759ca77773189126a' into glitch-soc/merge-upstream 2023-05-08 15:28:36 +02:00
initializers Merge commit 'd548faf69321260ab4c2a16759ca77773189126a' into glitch-soc/merge-upstream 2023-05-08 15:28:36 +02:00
locales Remove empty HTTP error translations (#24210) 2023-04-30 17:04:15 +09:00
locales-glitch New Crowdin updates (#2172) 2023-04-16 17:25:43 +02:00
webpack Fix some of the Javascript linting issues, as well as bugs and unneeded divergences with upstream (#2208) 2023-05-07 18:22:25 +02:00
application.rb Remove tai locale (#23880) 2023-04-23 22:49:07 +02: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 commit 'd548faf69321260ab4c2a16759ca77773189126a' into glitch-soc/merge-upstream 2023-05-08 15:28:36 +02:00
secrets.yml Upgrade to Rails 5.0.0.1 2016-08-17 17:58:00 +02:00
settings.yml Merge branch 'main' into glitch-soc/merge-upstream 2023-03-31 21:30:27 +02:00
sidekiq.yml Bump sidekiq-scheduler from 4.0.3 to 5.0.0 (#23212) 2023-02-13 13:31:42 +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-04-03 17:40:59 +02:00