Claire 2126812f65 Merge commit 'd9c21293aa6e105cedeff6b5e469af40a20909d9' into glitch-soc/merge-upstream ... Conflicts: - `app/views/settings/preferences/other/show.html.haml`: Upstream moved some settings, where glitch-soc has an extra setting. Ported upstream changes, moving the same settings as them.		2023-08-22 18:31:28 +02:00
..
admin	Add hCaptcha support (#25019)	2023-05-16 23:27:35 +02: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	Fix Rails/ContentTag cop (#24691)	2023-04-30 06:47:15 +02:00
context_helper.rb	Merge commit 'd9c21293aa6e105cedeff6b5e469af40a20909d9' into glitch-soc/merge-upstream	2023-08-22 18:31:28 +02:00
database_helper.rb	Fix not actually connecting to the configured replica (#25977)	2023-07-17 08:26:52 +02:00
domain_control_helper.rb	Refactor: replace whitelist_mode mentions with limited_federation_mode (#26252)	2023-08-02 19:32:48 +02:00
email_helper.rb	Apply Rubocop Performance/StringReplacement (#23445)	2023-02-08 03:21:21 +01:00
flashes_helper.rb	Clean up flash display in views (#2336)	2017-04-23 04:22:34 +02:00
formatting_helper.rb	Merge branch 'main' into glitch-soc/merge-upstream	2023-07-06 15:16:34 +02:00
home_helper.rb	Fix regressions from change in account row design in web UI (#24343)	2023-04-01 09:27:23 +02:00
instance_helper.rb	Remove instance variables from helper usage (#24203)	2023-04-23 22:35:54 +02:00
jsonld_helper.rb	Remove instance variables from helper usage (#24203)	2023-04-23 22:35:54 +02:00
languages_helper.rb	Allow filtering for Chinese languages (#26066)	2023-07-28 23:07:22 +02:00
mascot_helper.rb	Use custom mascot on static share page (#15687)	2021-02-11 02:18:56 +01:00
media_component_helper.rb	React component helper specs (#24072)	2023-04-26 18:21:32 +02:00
react_component_helper.rb	Fix /share and cleanup and reorganize frontend locale loading (#25240)	2023-06-02 15:00:27 +02:00
routing_helper.rb	Fix CDN_HOST not affected on full_asset_url (#18662)	2022-06-23 23:09:32 +02:00
settings_helper.rb	Remove unused picture_hint helper method (#25485)	2023-06-19 09:04:15 +02:00
statuses_helper.rb	Cleanup unused portions of statuses/status partial (#26045)	2023-07-19 08:44:16 +02:00
webfinger_helper.rb	Remove dependency on goldfinger gem (#14919)	2020-10-08 00:34:57 +02:00