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
..
environments	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
initializers	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
locales	Improve wording and add titles on moderated servers section in /about/more (#13930)	5 years ago
locales-glitch	Add support for setting Content Warning for CW-less outgoing toots	5 years ago
webpack	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
application.rb	Fix sr locale being selected over sr-Latn (#13693)	5 years ago
boot.rb	…
brakeman.ignore	Add E2EE API (#13820)	5 years ago
database.yml	…
deploy.rb	Include capistrano tasks that reload the services after deploying. (#12642)	5 years ago
environment.rb	…
i18n-tasks.yml	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
navigation.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
pghero.yml	Fix PgHero Content-Security-Policy when CDN_HOST is used (#13595)	5 years ago
puma.rb	Add PERSISTENT_TIMEOUT option (#11756)	5 years ago
routes.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
secrets.yml	…
settings.yml	Add support for setting Content Warning for CW-less outgoing toots	5 years ago
sidekiq.yml	Change trending hashtags to not disappear instantly after midnight (#11712)	5 years ago
webpacker.yml	…