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.

Thibaut Girka 12c8ac9e14 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/activitypub/collections_controller.rb`: Conflict due to glitch-soc having to take care of local-only pinned toots in that controller. Took upstream's changes and restored the local-only special handling. - `app/controllers/auth/sessions_controller.rb`: Minor conflicts due to the theming system, applied upstream changes, adapted the following two files for glitch-soc's theming system: - `app/controllers/concerns/sign_in_token_authentication_concern.rb` - `app/controllers/concerns/two_factor_authentication_concern.rb` - `app/services/backup_service.rb`: Minor conflict due to glitch-soc having to handle local-only toots specially. Applied upstream changes and restored the local-only special handling. - `app/views/admin/custom_emojis/index.html.haml`: Minor conflict due to the theming system. - `package.json`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file. - `yarn.lock`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file.		5 years ago
..
admin	Fix admin actions log crash when displaying updates of deleted announcements (#13489)	5 years ago
settings	Set up /settings/keyword_mutes. #164.	7 years ago
accounts_helper.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
application_helper.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
domain_control_helper.rb	Fix whitelist federation for subdomains (#12435)	5 years ago
flashes_helper.rb	Clean up flash display in views (#2336)	8 years ago
home_helper.rb	Fix use of inline CSS in public pages (#13576)	5 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
routing_helper.rb	Fix ruby 2.7 warnings about keyword parameters (#12824)	5 years ago
settings_helper.rb	Add `vi` to available locales (#13542)	5 years ago
statuses_helper.rb	Remove some duplicate methods from StatusHelper and reflect changes to AccountHelper (#12545)	5 years ago
webfinger_helper.rb	Fix performance of follow import (#13836)	5 years ago