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 dcded13a99 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - .github/ISSUE_TEMPLATE/bug_report.md Took our version. - CONTRIBUTING.md Updated the embedded copy of upstream's version. - README.md Took our version. - app/policies/status_policy.rb Not a real conflict, took code from both. - app/views/layouts/embedded.html.haml Added upstream's changes (dns-prefetch) and fixed `%body.embed` - app/views/settings/preferences/show.html.haml Reverted some of upstream changes, as we have a page dedicated for flavours and skins. - config/initializers/content_security_policy.rb Kept our version of the CSP. - config/initializers/doorkeeper.rb Not a real conflict, took code from both.		6 years ago
..
environments	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
initializers	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
locales	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
webpack	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
application.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
boot.rb	Lint pass (#8876)	6 years ago
brakeman.ignore	Add animate custom emoji param to embed pages (#8507)	6 years ago
database.yml	use-DB_NAME-in-development (#5430)	7 years ago
deploy.rb	Update dependencies for Ruby (2018-04-23) (#7237)	7 years ago
environment.rb	Make PreviewCard records reuseable between statuses (#4642)	7 years ago
i18n-tasks.yml	Ignore tootsuite-specific theme-related translation strings	7 years ago
navigation.rb	Revert Font Awesome 5 upgrade (#8810)	6 years ago
puma.rb	lint pass 2 (#8878)	6 years ago
routes.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
secrets.yml	…
settings.yml	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
sidekiq.yml	Track historical space stats in PgHero to determine PostgreSQL growth (#8906)	6 years ago
webpacker.yml	Fix building assets in test environment	6 years ago