tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Mastodon/config
History
Claire c81d1b0d38 Merge commit 'c8181eb0a41c4f5c1655d4e400cab071aee4182a' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/packs/admin.jsx`:
  Upstream reworked imports, but we had many changes.
  Reworked imports as upstream did.
- `app/javascript/packs/public.jsx`:
  Upstream reworked imports, but we had many changes.
  Reworked imports as upstream did.
2023-05-09 22:12:05 +02:00
..
environments
Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream
2023-05-08 19:28:21 +02:00
initializers
Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream
2023-05-08 19:28:21 +02:00
locales
Rewrite import feature (#21054)
2023-05-02 12:08:48 +02:00
locales-glitch
New Crowdin updates (#2172)
2023-04-16 17:25:43 +02:00
routes
Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream
2023-05-08 19:28:21 +02:00
webpack
Merge commit 'c8181eb0a41c4f5c1655d4e400cab071aee4182a' into glitch-soc/merge-upstream
2023-05-09 22:12:05 +02:00
application.rb
Remove tai locale (#23880)
2023-04-23 22:49:07 +02:00
boot.rb
…
brakeman.ignore
…
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
…
i18n-tasks.yml
Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream
2023-05-08 19:28:21 +02:00
navigation.rb
Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream
2023-05-08 19:28:21 +02:00
pghero.yml
…
puma.rb
Support the PROXY protocol through the PROXY_PROTO_V1 env variable (#24064)
2023-03-14 14:47:57 +01:00
roles.yml
…
routes.rb
Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream
2023-05-08 19:28:21 +02:00
secrets.yml
…
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
…
webpacker.yml
Merge branch 'main' into glitch-soc/merge-upstream
2023-04-03 17:40:59 +02:00