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 12b935fadf Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/dependabot.yml`: Updated upstream, removed in glitch-soc to disable noise. Kept removed. - `CODE_OF_CONDUCT.md`: Upstream updated to a new version of the covenant, but I have not read it yet, so kept unchanged. - `Gemfile.lock`: Not a real conflict, one upstream dependency updated textually too close to the glitch-soc only `hcaptcha` dependency. Applied upstream changes. - `app/controllers/admin/base_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/application_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/disputes/base_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/relationships_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/statuses_cleanup_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/helpers/application_helper.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/javascript/mastodon/features/compose/components/compose_form.jsx`: Upstream added a highlight animation for onboarding, while we changed the max character limit. Applied our local changes on top of upstream's new version. - `app/views/layouts/application.html.haml`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `stylelint.config.js`: Upstream added ignore paths, glitch-soc had extra ignore paths. Added the same paths as upstream.		2 years ago
..
admin	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
accounts_helper.rb	Fix most rubocop issues (#2165)	2 years ago
application_helper.rb	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
branding_helper.rb	Autofix Rubocop Style/RedundantBegin (#23703)	2 years ago
context_helper.rb	Compact JSON-LD signed incoming activities (#17426)	3 years ago
domain_control_helper.rb	Autofix Rubocop Style/RedundantBegin (#23703)	2 years 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	2 years 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	Remove `tai` locale (#23880)	2 years 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	React component helper specs (#24072)	2 years ago
routing_helper.rb	Fix CDN_HOST not affected on full_asset_url (#18662)	2 years ago
settings_helper.rb	Remove language detection through cld3 (#17478)	3 years ago
statuses_helper.rb	React component helper specs (#24072)	2 years ago
webfinger_helper.rb	Remove dependency on goldfinger gem (#14919)	4 years ago