fef 92384b1563 make number of visible reactions a vanilla setting ... Reactions will be backported to the vanilla flavour, which requires all related settings to be accessible from the vanilla settings page rather than the glitch specific settings modal.		2023-05-07 00:58:56 -07:00
..
environments	Merge branch 'main' into glitch-soc/merge-upstream	2023-03-22 19:50:11 +01:00
initializers	Merge branch 'main' into glitch-soc/merge-upstream	2023-04-29 10:44:56 +02:00
locales	make number of visible reactions a vanilla setting	2023-05-07 00:58:56 -07:00
locales-glitch	New Crowdin updates (#2172)	2023-04-16 17:25:43 +02:00
webpack	Move locale-data back to app/javascript/mastodon/locales/locale-data (#2169)	2023-04-08 14:11:40 +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	Change master branch to main branch (#20290)	2022-11-10 04:02:05 +01:00
environment.rb	Make PreviewCard records reuseable between statuses (#4642)	2017-09-01 16:20:16 +02:00
i18n-tasks.yml	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-18 17:38:11 +01:00
navigation.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-17 12:01:37 +01: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	add backend support for status emoji reactions	2023-05-07 00:58:02 -07: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	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