You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Claire c6212d89f8 Merge commit '9e6c02fd815253712c2e8ba1c1ebed092a007653' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/application_controller.rb: Upstream added an `include` where we had an extra `include` due to glitch-soc's theming system. Added upstream's new `include`.		1 year ago
..
environments	Merge commit '9e6c02fd815253712c2e8ba1c1ebed092a007653' into glitch-soc/merge-upstream	1 year ago
imagemagick	Merge pull request from GHSA-9928-3cp5-93fm	1 year ago
initializers	Merge commit '9e6c02fd815253712c2e8ba1c1ebed092a007653' into glitch-soc/merge-upstream	1 year ago
locales	Enable Rubocop Style/FrozenStringLiteralComment (#23793)	1 year ago
locales-glitch	Merge commit '2d058a8499fba7ba97bd3c10a40412f0bbacf1e7' into glitch-soc/merge-upstream	1 year ago
routes	Merge commit '29c29410d2b5386dddcb12bdb413c7b3d078dbc5' into glitch-soc/merge-upstream	1 year ago
webpack	Switch to using a `common` runtime chunk rather than `locales`	1 year ago
application.rb	Rails 7.0 update (#25668)	1 year ago
boot.rb	Enable Rubocop Style/FrozenStringLiteralComment (#23793)	1 year ago
brakeman.ignore	Refactor `Trends::Query` to avoid brakeman sql injection warnings (#25881)	1 year ago
database.yml	First pass at multi-database for read replica using Rails native adapter (#25693)	1 year ago
deploy.rb	Fix Performance/CollectionLiteralInLoop cop (#24819)	2 years ago
environment.rb	Enable Rubocop Style/FrozenStringLiteralComment (#23793)	1 year ago
formatjs-formatter.js	Merge commit '76960f128a764f5105c076813d8ffaa0df985dda' into glitch-soc/merge-upstream	1 year ago
i18n-tasks.yml	Merge commit 'b945f16ddf0c87654d5dc5d0f46f475913247dab' into glitch-soc/merge-upstream	1 year ago
navigation.rb	Merge commit '2d058a8499fba7ba97bd3c10a40412f0bbacf1e7' into glitch-soc/merge-upstream	1 year ago
pghero.yml	Fix PgHero Content-Security-Policy when CDN_HOST is used (#13595)	5 years ago
puma.rb	Enable Rubocop Style/FrozenStringLiteralComment (#23793)	1 year ago
roles.yml	Add customizable user roles (#18641)	2 years ago
routes.rb	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
secrets.yml	Upgrade to Rails 5.0.0.1	8 years ago
settings.yml	Merge commit '844d8e101e84cc1c27c99005b7059a975ac826ca' into glitch-soc/merge-upstream	1 year ago
sidekiq.yml	Bump sidekiq-scheduler from 4.0.3 to 5.0.0 (#23212)	2 years ago
storage.yml	Update Mastodon to Rails 6.1 (#15910)	4 years ago
webpacker.yml	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago