djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-01-13 03:02:54 -05:00
Code Issues Packages Projects Releases Wiki Activity
tootlab-mastodon/config
History
Claire 6c99479ef4 Merge commit '9e245d147bcb2c72cc552ff8c276a1c34e2f686d' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/settings/profiles/show.html.haml`:
  Upstream redesigned the settings page, where glitch-soc had changes because of
  the ability to set some custom limits.
  Went with upstream's design while keeping our custom limits.
- `yarn.lock`:
  Upstream updated dependencies textually close to a glitch-soc-only dependency.
  Updated the dependnencies as well.
2023-06-18 13:41:33 +02:00
..
environments
Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream
2023-05-08 19:28:21 +02:00
initializers
Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream
2023-06-10 16:48:01 +02:00
locales
Change edit profile page (#25413)
2023-06-14 04:38:07 +02:00
locales-glitch
Merge commit '9e245d147bcb2c72cc552ff8c276a1c34e2f686d' into glitch-soc/merge-upstream
2023-06-18 13:41:33 +02:00
routes
Merge commit '9e245d147bcb2c72cc552ff8c276a1c34e2f686d' into glitch-soc/merge-upstream
2023-06-18 13:41:33 +02:00
webpack
Switch to using a common runtime chunk rather than locales
2023-06-10 17:43:13 +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
Fix Performance/CollectionLiteralInLoop cop (#24819)
2023-05-04 05:33:55 +02:00
environment.rb
…
formatjs-formatter.js
Merge commit '44cd88adc4e2f4028dcc2b08b98368f0dc90cee4' into glitch-soc/merge-upstream
2023-06-10 12:38:33 +02:00
i18n-tasks.yml
Merge commit '39110d1d0af5e3d9cf452ae47496a52797249fd0' into glitch-soc/merge-upstream
2023-06-18 10:36:14 +02:00
navigation.rb
Merge commit '9e245d147bcb2c72cc552ff8c276a1c34e2f686d' into glitch-soc/merge-upstream
2023-06-18 13:41:33 +02: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 '39110d1d0af5e3d9cf452ae47496a52797249fd0' into glitch-soc/merge-upstream
2023-06-18 10:36:14 +02:00
secrets.yml
…
settings.yml
Merge commit 'bec6a1cad4c509c53deb378c7ba984ba7e2de5a9' into glitch-soc/merge-upstream
2023-05-25 22:49:18 +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