Claire 8103e69b17 Merge commit '77cd16f4ee7ab807df6fffb1538a6659a8182a9e' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/styles/mastodon/components.scss`: Conflict caused by glitch-soc changing the path to images, and upstream removing styling using such an image. Removed the styling as upstream did. - `app/models/account.rb`: Conflict due to upstream changing lines adjacent to a change made in glitch-soc to have configurable limits. Ported upstream's changes. - `yarn.lock`: Dependencies adjacent to glitch-soc-only dependencies updated. Updated them as well.		2024-10-26 13:38:07 +02:00
..
admin	Move hcaptcha service config to config_for yml (#30662)	2024-10-23 14:25:43 +00:00
accounts_helper.rb	Merge commit '24ef8255b3f9b44cb54f49bc78fe3382a7070b1a' into glitch-soc/merge-upstream	2024-09-12 20:05:08 +02:00
application_helper.rb	Merge commit '77cd16f4ee7ab807df6fffb1538a6659a8182a9e' into glitch-soc/merge-upstream	2024-10-26 13:38:07 +02:00
authorized_fetch_helper.rb	Fix Setting.authorized_fetch not being properly taken into consideration (#26958)	2023-09-18 09:37:29 +02:00
branding_helper.rb	Remove image_pack_tag usage (#29925)	2024-04-15 09:05:19 +00:00
context_helper.rb	Merge commit '7ed9c590b98610f8d68deab9ef8df260eec6d8f0' into glitch-soc/merge-upstream	2024-09-21 15:06:06 +02:00
database_helper.rb	Fix ActiveRecord using two connection pools when no replica is defined (#27061)	2023-09-22 16:01:59 +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
filters_helper.rb	Extract helper methods for labels from filters/_filter_fields (#27574)	2023-11-29 10:02:59 +00:00
flashes_helper.rb
formatting_helper.rb	Merge commit '1fc165de02d79294c8a218f5fa82bcd477484ca1' into glitch-soc/merge-upstream	2024-10-19 19:13:32 +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	Add icon field to instance endpoint (#30205)	2024-08-22 10:04:27 +00:00
invites_helper.rb	Fix haml-lint InstanceVariables rule for invites/_form (#26064)	2023-09-28 15:40:28 +02:00
jsonld_helper.rb	Remove unused merge_context helper (#31703)	2024-09-03 08:59:37 +00:00
languages_helper.rb	Fix tl language native name (#32606)	2024-10-22 08:41:40 +00:00
media_component_helper.rb	Change embedded posts to use web UI (#31766)	2024-09-12 09:41:19 +00:00
react_component_helper.rb	Move direct serializer usage out of admin view partial (#29028)	2024-02-06 13:18:37 +00:00
registration_helper.rb	Add support for invite codes in the registration API (#27805)	2023-11-13 13:27:00 +00:00
routing_helper.rb	Use a helper to avoid using media/ asset prefixes (#28756)	2024-01-17 12:19:51 +00:00
self_destruct_helper.rb	Add SELF_DESTRUCT env variable to process self-destructions in the background (#26439)	2023-10-23 15:46:21 +00:00
settings_helper.rb	Only show recently used tags hint when they are present (#32120)	2024-09-27 08:18:42 +00:00
statuses_helper.rb	Use array compact style for classes in nothing_here helper (#32403)	2024-10-15 13:56:29 +00:00
theme_helper.rb	Merge commit '9d0bce40724eb77b7cc3917091b62e4ab159e29e' into glitch-soc/merge-upstream	2024-07-15 18:51:38 +02:00