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 63969b15b3 Merge commit '8bffce5f015ace5b73d5a8aa746c02e374d927bb' into glitch-soc/merge-upstream ... Conflicts: - `app/models/form/admin_settings.rb`: Upstream added the notion of overriden settings, while we had extra code for pseudo-settings (only used to combine flavour and skin in a single select field). Ported upstream changes. - `config/i18n-tasks.yml`: Upstream added `simple_form.overridden` to `ignore_unused`, we had `simple_form.glitch_only`. Added `simple_form.glitch_only` as well.		1 year ago
..
admin	Add hCaptcha support (#25019)	2 years ago
accounts_helper.rb	Merge commit 'fc6d89573cc6d07b8b82c096d1ee04c5f7909460' into glitch-soc/merge-upstream	1 year ago
application_helper.rb	Merge commit '58b52b7a33717406faa8d988b7c05efa52f46f6a' into glitch-soc/merge-upstream	1 year ago
authorized_fetch_helper.rb	Add `authorized_fetch` server setting in addition to env var (#25798)	1 year ago
branding_helper.rb	Fix Rails/ContentTag cop (#24691)	2 years ago
context_helper.rb	Merge commit '032dfdfb70963ec9dbdad8f40b5056e16680ec86' into glitch-soc/merge-upstream	1 year ago
database_helper.rb	Fix not actually connecting to the configured replica (#25977)	1 year ago
domain_control_helper.rb	Refactor: replace whitelist_mode mentions with limited_federation_mode (#26252)	1 year ago
email_helper.rb	Apply Rubocop Performance/StringReplacement (#23445)	2 years ago
flashes_helper.rb	Clean up flash display in views (#2336)	8 years ago
formatting_helper.rb	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
home_helper.rb	Fix regressions from change in account row design in web UI (#24343)	2 years ago
instance_helper.rb	Remove instance variables from helper usage (#24203)	2 years ago
jsonld_helper.rb	Remove instance variables from helper usage (#24203)	2 years ago
languages_helper.rb	Add Kalmyk to languages dropdown (#26013)	1 year ago
mascot_helper.rb	Use custom mascot on static share page (#15687)	4 years ago
media_component_helper.rb	React component helper specs (#24072)	2 years ago
react_component_helper.rb	Fix `/share` and cleanup and reorganize frontend locale loading (#25240)	1 year ago
routing_helper.rb	Fix CDN_HOST not affected on full_asset_url (#18662)	2 years ago
settings_helper.rb	Remove unused `picture_hint` helper method (#25485)	1 year ago
statuses_helper.rb	Cleanup unused portions of statuses/status partial (#26045)	1 year ago
webfinger_helper.rb	Remove dependency on goldfinger gem (#14919)	4 years ago