mastodon/app
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.
2018-10-22 17:51:38 +02:00
..
chewy Get rid of Chewy order/limit warning (#8355) 2018-08-22 02:44:56 +02:00
controllers Merge branch 'master' into glitch-soc/merge-upstream 2018-10-22 17:51:38 +02:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2018-10-22 17:51:38 +02:00
javascript Merge branch 'master' into glitch-soc/merge-upstream 2018-10-22 17:51:38 +02:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2018-10-22 17:51:38 +02:00
mailers Fix low-hanging rubocop gripes (#8458) 2018-08-26 19:22:46 +02:00
models Merge branch 'master' into glitch-soc/merge-upstream 2018-10-22 17:51:38 +02:00
policies Merge branch 'master' into glitch-soc/merge-upstream 2018-10-22 17:51:38 +02:00
presenters Merge branch 'master' into glitch-soc/merge-upstream 2018-10-08 13:51:33 +02:00
serializers Merge branch 'master' into glitch-soc/merge-upstream 2018-10-22 17:51:38 +02:00
services Merge branch 'master' into glitch-soc/merge-upstream 2018-10-22 17:51:38 +02:00
validators Merge branch 'master' into glitch-soc/merge-upstream 2018-10-05 15:23:57 +02:00
views Merge branch 'master' into glitch-soc/merge-upstream 2018-10-22 17:51:38 +02:00
workers Improve support for aspects/circles (#8950) 2018-10-17 17:13:04 +02:00