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 74c5b2bd08 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile - app/controllers/api/v1/search_controller.rb Conflict because we changed the number of default results to be configurable - app/lib/settings/scoped_settings.rb Addition of a new “noindex” site-wide setting, conflict due to our change of the two other site-wide settings (default flavour and skin instead of theme) - spec/controllers/application_controller_spec.rb Addition of a new “noindex” site-wide setting, conflict due to our change of the two other site-wide settings (default flavour and skin instead of theme)		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	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
webpack	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
application.rb	Change locale detection to run once per session (#8657)	5 years ago
boot.rb	…
brakeman.ignore	Add type, limit, offset, min_id, max_id, account_id to search API (#10091)	6 years ago
database.yml	config: add DB_SSLMODE for managed/remote PG (#10210)	6 years ago
deploy.rb	Bump capistrano from 3.11.0 to 3.11.1 (#11731)	5 years ago
environment.rb	…
i18n-tasks.yml	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
navigation.rb	Merge branch 'master' into glitch-soc/merge-upstream	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	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
sidekiq.yml	Change trending hashtags to not disappear instantly after midnight (#11712)	5 years ago
webpacker.yml	Do not try to parse gif files as CSS or JS	6 years ago