treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
mastodon/config
History
Claire 82eebd0482 Merge commit '41a505513fb36f7c28c8d8a4270d5ee192169462' into glitch-soc/merge-upstream 
Conflicts:
- `app/serializers/initial_state_serializer.rb`:
  Upstream renamed an initial state parameter, where we had extra ones.
  Renamed as upstream did.
- `app/workers/feed_insert_worker.rb`:
  Upstream wrapped database query in a block, we had extra database
  queries because of the DM timeline.
  Moved everything in the block.
 		2023-07-12 15:27:32 +02:00
..
environments Revert "Rails 7 update" (#25667) 2023-07-02 11:14:22 +02:00
imagemagick Merge pull request from GHSA-9928-3cp5-93fm 2023-07-06 15:05:05 +02:00
initializers Merge commit '41a505513fb36f7c28c8d8a4270d5ee192169462' into glitch-soc/merge-upstream 2023-07-12 15:27:32 +02:00
locales Add finer permission requirements for managing webhooks (#25463) 2023-06-22 14:52:25 +02:00
locales-glitch Merge commit '9e245d147bcb2c72cc552ff8c276a1c34e2f686d' into glitch-soc/merge-upstream 2023-06-18 13:41:33 +02:00
routes Merge branch 'main' into glitch-soc/merge-upstream 2023-07-02 11:49:08 +02:00
webpack Switch to using a `common` runtime chunk rather than `locales` 2023-06-10 17:43:13 +02:00
application.rb Merge pull request from GHSA-9928-3cp5-93fm 2023-07-06 15:05:05 +02:00
boot.rb Use default `bootsnap/setup` in boot.rb (#25502) 2023-06-22 18:46:32 +02:00
brakeman.ignore Regenerate brakeman ignore, pruning warnings (#25749) 2023-07-08 11:07:19 +02:00
database.yml First pass at multi-database for read replica using Rails native adapter (#25693) 2023-07-08 19:45:36 +02: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
…
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 branch 'main' into glitch-soc/merge-upstream 2023-07-05 12:01:26 +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
…
webpacker.yml Merge branch 'main' into glitch-soc/merge-upstream 2023-04-03 17:40:59 +02:00