treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
mastodon/config
History
Claire c59fb65ddc Merge commit '127503eb2cdd67126974bee304dde0f183300b84' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/accounts_helper.rb`:
  Conflict due to glitch-soc's option to hide followers count.
  Ported upstream changes.

Additional changes:
- `app/views/application/mailer/_account.html.haml`:
  Ported glitch-soc's option to hide followers count.
- `app/views/settings/flavours/show.html.haml`:
  Ported the `frontend_asset_url` helper change to glitch-soc.
 		2024-01-17 18:32:15 +01:00
..
environments Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream 2023-12-20 22:16:50 +01:00
imagemagick Fix AVIF attachments (#26264) 2023-08-01 19:34:11 +02:00
initializers Merge commit '127503eb2cdd67126974bee304dde0f183300b84' into glitch-soc/merge-upstream 2024-01-17 18:32:15 +01:00
locales New Crowdin Translations (automated) (#28749) 2024-01-17 14:23:14 +00:00
locales-glitch Fix i18n unused check being tripped by `no` in YAML files (#2496) 2023-12-03 11:21:34 +01:00
routes Merge branch 'main' into glitch-soc/merge-upstream 2023-12-28 16:57:10 +01:00
webpack Merge commit '01b6c83c369061c2175d50dfb3ae1db502862664' into glitch-soc/merge-upstream 2024-01-16 12:04:11 +01:00
application.rb Enable Rails 7.1 Marshalling format (#28609) 2024-01-05 21:57:47 +00:00
boot.rb Fix `Style/StderrPuts` cop (#28389) 2023-12-18 09:36:08 +00:00
brakeman.yml Configure brakeman to ignore url safe preview card urls (#25883) 2023-10-20 15:32:16 +02:00
database.yml Using Sidekiq concurrency for default db pool value (#26488) 2023-11-08 13:15:43 +00:00
deploy.rb Fix `Lint/SymbolConversion` cop (#28175) 2023-12-01 15:53:35 +00:00
environment.rb Enable Rubocop Style/FrozenStringLiteralComment (#23793) 2023-07-12 09:47:08 +02:00
formatjs-formatter.js Merge commit '44cd88adc4e2f4028dcc2b08b98368f0dc90cee4' into glitch-soc/merge-upstream 2023-06-10 12:38:33 +02:00
i18n-tasks.yml Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream 2023-12-20 22:16:50 +01:00
navigation.rb Merge commit '379115e601361c2b5da775fbf28b7dff9dc02e71' into glitch-soc/merge-upstream 2023-10-24 19:31:14 +02:00
pghero.yml
…
puma.rb Enable Rubocop Style/FrozenStringLiteralComment (#23793) 2023-07-12 09:47:08 +02:00
roles.yml
…
routes.rb Merge commit 'f99e05710ea06cf10bbd3fb64ae8c00b095cb455' into glitch-soc/merge-upstream 2023-12-21 19:24:10 +01:00
secrets.yml
…
settings.yml Merge commit 'bec6a1cad4c509c53deb378c7ba984ba7e2de5a9' into glitch-soc/merge-upstream 2023-05-25 22:49:18 +02:00
sidekiq.yml Add SELF_DESTRUCT env variable to process self-destructions in the background (#26439) 2023-10-23 15:46:21 +00:00
storage.yml
…
webpacker.yml Merge commit '4ad1c5aa7174e5cef4ba9608a44429916a119bee' into glitch-soc/merge-upstream 2023-09-02 13:31:15 +02:00