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 e2a2bc9021 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream updated copyright year, we don't mention it so kept our version. - `app/controllers/admin/dashboard_controller.rb`: Not really a conflict, upstream change (removing the spam checker) too close to glitch-soc changes. Ported upstream changes. - `app/models/form/admin_settings.rb`: Same. - `app/services/remove_status_service.rb`: Same. - `app/views/admin/settings/edit.html.haml`: Same. - `config/settings.yml`: Same. - `config/environments/production.rb`: Not a real conflict, upstream added a default HTTP header, but we have extra headers in glitch-soc. Added the header.		3 years ago
..
admin	Add IP-based rules (#14963)	4 years ago
settings	…
accounts_helper.rb	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
application_helper.rb	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
domain_control_helper.rb	Fix whitelist federation for subdomains (#12435)	4 years ago
email_helper.rb	Add canonical e-mail blocks for suspended accounts (#16049)	3 years ago
flashes_helper.rb	…
home_helper.rb	Fix use of inline CSS in public pages (#13576)	4 years ago
instance_helper.rb	Change OpenGraph description on sign-up page to reflect invite (#11744)	5 years ago
jsonld_helper.rb	Bump json-ld-preloaded from 3.0.2 to 3.0.3 (#11316)	5 years ago
mascot_helper.rb	Use custom mascot on static share page (#15687)	3 years ago
routing_helper.rb	Fix ruby 2.7 warnings about keyword parameters (#12824)	4 years ago
settings_helper.rb	Add missing locales (#15138)	4 years ago
statuses_helper.rb	Change RTL detection to rely on unicode-bidi paragraph by paragraph (#14573)	3 years ago
webfinger_helper.rb	Remove dependency on goldfinger gem (#14919)	4 years ago