Claire 993d0a9950 Merge commit '1e3b19230a48174acf524cf1a9f5a498e220ea7d' into glitch-soc/merge-upstream ... Conflicts: - `app/models/account.rb`: Upstream added new validations close to lines on which glitch-soc had modified validations to handle custom limits set through environment variables. Ported upstream changes. - `config/initializers/content_security_policy.rb`: Upstream added `AZURE_ALIAS_HOST`. Glitch-soc's version of the file is completely different. Added `AZURE_ALIAS_HOST` to our version of the file.		2023-07-30 13:15:01 +02:00
..
admin	Merge branch 'main' into glitch-soc/merge-upstream	2023-03-02 17:32:38 +01:00
accounts_helper.rb	Merge commit '5a3f174d561cbdc79a597cd2b9502ed058d372da' into glitch-soc/merge-upstream	2023-07-13 14:22:20 +02:00
application_helper.rb	Merge commit '1e3b19230a48174acf524cf1a9f5a498e220ea7d' into glitch-soc/merge-upstream	2023-07-30 13:15:01 +02:00
branding_helper.rb
context_helper.rb
database_helper.rb	Fix not actually connecting to the configured replica (#25977)	2023-07-17 08:26:52 +02:00
domain_control_helper.rb	Update rubocop to v1.54.1 (#25627)	2023-07-13 11:11:55 +02:00
email_helper.rb
flashes_helper.rb
formatting_helper.rb	Merge branch 'main' into glitch-soc/merge-upstream	2023-07-06 15:16:34 +02:00
home_helper.rb
instance_helper.rb
jsonld_helper.rb
languages_helper.rb
mascot_helper.rb
media_component_helper.rb	React component helper specs (#24072)	2023-04-26 18:21:32 +02:00
react_component_helper.rb
routing_helper.rb
settings_helper.rb
statuses_helper.rb	Cleanup unused portions of statuses/status partial (#26045)	2023-07-19 08:44:16 +02:00
webfinger_helper.rb