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 2aaf3528ca Merge commit 'd548faf69321260ab4c2a16759ca77773189126a' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/styles/mastodon/forms.scss`: Conflict because we ran eslint autofix on upstream files. - `config/initializers/content_security_policy.rb`: Code style changes but we have a different version. Kept our version. - `streaming/index.js`: Upstream fixed a typo close to glitch-soc-only code. Applied upstream's changes.		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 commit 'd548faf69321260ab4c2a16759ca77773189126a' into glitch-soc/merge-upstream	2 years ago
branding_helper.rb	Fix Rails/ContentTag cop (#24691)	2 years ago
context_helper.rb	…
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	…
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	…
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	…
statuses_helper.rb	Fix Rails/CompactBlank cop (#24690)	2 years ago
webfinger_helper.rb	…