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 193250556c Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream changed their README, we have our own. Kept ours. - `app/helpers/application_helper.rb`: Minor code style fix upstream, on a line that is different in glitch-soc due to the different theming system. Applied the code style fix to our own code. - `app/views/settings/preferences/appearance/show.html.haml`: Code style fix on a line next to lines exclusive to glitch-soc. Applied upstream changes. - `yarn.lock`: Upstream updated a dependency textually close to a glitch-soc-only dependency. Updated the dependency like upstream did.		2 years ago
..
admin	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
accounts_helper.rb	Merge branch 'main' into glitch-soc/merge-upstream	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	Spec coverage for HomeHelper (#23907)	2 years ago
instance_helper.rb	Autofix Rubocop Style/RedundantBegin (#23703)	2 years ago
jsonld_helper.rb	Autofix Rubocop Style/RedundantBegin (#23703)	2 years ago
languages_helper.rb	Autofix Rubocop remaining Layout rules (#23679)	2 years ago
mascot_helper.rb	Use custom mascot on static share page (#15687)	4 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	Fix attachment rendering of edited posts in OpenGraph (#22270)	2 years ago
webfinger_helper.rb	Remove dependency on goldfinger gem (#14919)	4 years ago