Floppy disk on public views

2.4.2rc2 except without the bad stuff
Use cybrespace repo url in getting started footer
2018-09-14 14:24:42 -07:00 · 2018-09-14 14:11:37 -07:00 · 2018-09-11 20:18:36 -07:00 · 2018-09-11 20:17:06 -07:00 · 2018-09-11 20:17:06 -07:00 · 2018-09-11 20:17:06 -07:00
699 changed files with 6611 additions and 19371 deletions
--- a/.babelrc
+++ b/.babelrc
@ -0,0 +1,66 @@
 {
  "presets": [
    "react",
    [
      "env",
      {
        "exclude": ["transform-async-to-generator", "transform-regenerator"],
        "loose": true,
        "modules": false,
        "targets": {
          "browsers": ["last 2 versions", "IE >= 11", "iOS >= 9"]
        }
      }
    ]
  ],
  "plugins": [
    "syntax-dynamic-import",
    ["transform-object-rest-spread", { "useBuiltIns": true }],
    "transform-decorators-legacy",
    "transform-class-properties",
    [
      "react-intl",
      {
        "messagesDir": "./build/messages"
      }
    ],
    "preval"
  ],
  "env": {
    "development": {
      "plugins": [
        "transform-react-jsx-source",
        "transform-react-jsx-self"
      ]
    },
    "production": {
      "plugins": [
        "lodash",
        [
          "transform-react-remove-prop-types",
          {
            "mode": "remove",
            "removeImport": true,
            "additionalLibraries": [
              "react-immutable-proptypes"
            ]
          }
        ],
        "transform-react-inline-elements",
        [
          "transform-runtime",
          {
            "helpers": true,
            "polyfill": false,
            "regenerator": false
          }
        ]
      ]
    },
    "test": {
      "plugins": [
        "transform-es2015-modules-commonjs"
      ]
    }
  }
 }
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@ -13,9 +13,6 @@ aliases:
          ALLOW_NOPAM: true
          CONTINUOUS_INTEGRATION: true
          DISABLE_SIMPLECOV: true
          PAM_ENABLED: true
          PAM_DEFAULT_SERVICE: pam_test
          PAM_CONTROLLED_SERVICE: pam_test_controlled
    working_directory: ~/projects/mastodon/
  - &attach_workspace
@ -175,8 +172,6 @@ jobs:
      - *attach_workspace
      - run: bundle exec i18n-tasks check-normalized
      - run: bundle exec i18n-tasks unused
      - run: bundle exec i18n-tasks missing -t plural
      - run: bundle exec i18n-tasks check-consistent-interpolations
 workflows:
  version: 2
--- a/.env.test
+++ b/.env.test
@ -3,3 +3,7 @@ NODE_ENV=test
 # Federation
 LOCAL_DOMAIN=cb6e6126.ngrok.io
 LOCAL_HTTPS=true
 # test pam authentication
 PAM_ENABLED=true
 PAM_DEFAULT_SERVICE=pam_test
 PAM_CONTROLLED_SERVICE=pam_test_controlled
--- a/.env.vagrant
+++ b/.env.vagrant
@ -1,2 +1,2 @@
 VAGRANT=true
-LOCAL_DOMAIN=mastodon.local
+LOCAL_DOMAIN=mastodon.dev
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@ -1,27 +1,12 @@
 ---
 name: Bug Report
-about: If something isn't working as expected
+about: Create a report to help us improve
 ---
-<!-- Make sure that you are submitting a new bug that was not previously reported or already fixed -->
+[Issue text goes here].
-<!-- Please use a concise and distinct title for the issue -->
+* * * *
-### Expected behaviour
+- [ ] I searched or browsed the repo’s other issues to ensure this is not a duplicate.
-
+- [ ] This bug happens on a [tagged release](https://github.com/tootsuite/mastodon/releases) and not on `master` (If you're a user, don't worry about this).
 <!-- What should have happened? -->
 ### Actual behaviour
 <!-- What happened? -->
 ### Steps to reproduce the problem
 <!-- What were you trying to do? -->
 ### Specifications
 <!-- What version or commit hash of Mastodon did you find this bug in? -->
 <!-- If a front-end issue, what browser and operating systems were you using? -->
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@ -1,17 +1,11 @@
 ---
 name: Feature Request
-about: I have a suggestion
+about: Suggest an idea for this project
 ---
-<!-- Please use a concise and distinct title for the issue -->
+[Issue text goes here].
-<!-- Consider: Could it be implemented as a 3rd party app using the REST API instead? -->
+* * * *
-### Pitch
+- [ ] I searched or browsed the repo’s other issues to ensure this is not a duplicate.
 <!-- Describe your idea for a feature. Make sure it has not already been suggested/implemented/turned down before -->
 ### Motivation
 <!-- Why do you think this feature is needed? Who would benefit from it? -->
--- a/.github/ISSUE_TEMPLATE/support.md
+++ b/.github/ISSUE_TEMPLATE/support.md
@ -1,10 +0,0 @@
 ---
 name: Support
 about: Ask for help with your deployment
 ---
 We primarily use GitHub as a bug and feature tracker. For usage questions, troubleshooting of deployments and other individual technical assistance, please use one of the resources below:
 - https://discourse.joinmastodon.org
 - #mastodon on irc.freenode.net
--- a/.rubocop.yml
+++ b/.rubocop.yml
@ -77,11 +77,6 @@ Rails/SkipsModelValidations:
 Rails/HttpStatus:
  Enabled: false
 Rails/Exit:
  Exclude:
    - 'lib/mastodon/*'
    - 'lib/cli'
 Style/ClassAndModuleChildren:
  Enabled: false
--- a/.ruby-version
+++ b/.ruby-version
@ -1 +1 @@
-2.5.3
+2.5.1
--- a/AUTHORS.md
+++ b/AUTHORS.md
@ -3,85 +3,76 @@ and provided thanks to the work of the following contributors:
 * [Gargron](https://github.com/Gargron)
 * [ykzts](https://github.com/ykzts)
 * [akihikodaki](https://github.com/akihikodaki)
 * [mjankowski](https://github.com/mjankowski)
-* [ThibG](https://github.com/ThibG)
+* [akihikodaki](https://github.com/akihikodaki)
 * [unarist](https://github.com/unarist)
 * [m4sk1n](https://github.com/m4sk1n)
 * [yiskah](https://github.com/yiskah)
 * [m4sk1n](https://github.com/m4sk1n)
 * [nolanlawson](https://github.com/nolanlawson)
 * [sorin-davidoi](https://github.com/sorin-davidoi)
 * [abcang](https://github.com/abcang)
 * [ThibG](https://github.com/ThibG)
 * [lynlynlynx](https://github.com/lynlynlynx)
 * [dependabot[bot]](https://github.com/apps/dependabot)
 * [alpaca-tc](https://github.com/alpaca-tc)
 * [nclm](https://github.com/nclm)
 * [ineffyble](https://github.com/ineffyble)
 * [renatolond](https://github.com/renatolond)
 * [jeroenpraat](https://github.com/jeroenpraat)
 * [mayaeh](https://github.com/mayaeh)
 * [blackle](https://github.com/blackle)
 * [Quent-in](https://github.com/Quent-in)
 * [JantsoP](https://github.com/JantsoP)
 * [nullkal](https://github.com/nullkal)
 * [yookoala](https://github.com/yookoala)
 * [mabkenar](https://github.com/mabkenar)
 * [ysksn](https://github.com/ysksn)
 * [shuheiktgw](https://github.com/shuheiktgw)
 * [ashfurrow](https://github.com/ashfurrow)
 * [Kjwon15](https://github.com/Kjwon15)
 * [zunda](https://github.com/zunda)
 * [eramdam](https://github.com/eramdam)
-* [masarakki](https://github.com/masarakki)
+* [mayaeh](https://github.com/mayaeh)
-* [takayamaki](https://github.com/takayamaki)
+* [zunda](https://github.com/zunda)
 * [ticky](https://github.com/ticky)
-* [Quenty31](https://github.com/Quenty31)
+* [masarakki](https://github.com/masarakki)
 * [danhunsaker](https://github.com/danhunsaker)
 * [ThisIsMissEm](https://github.com/ThisIsMissEm)
 * [hcmiya](https://github.com/hcmiya)
 * [stephenburgess8](https://github.com/stephenburgess8)
 * [Wonderfall](https://github.com/Wonderfall)
 * [matteoaquila](https://github.com/matteoaquila)
 * [rkarabut](https://github.com/rkarabut)
-* [yukimochi](https://github.com/yukimochi)
+* [stephenburgess8](https://github.com/stephenburgess8)
 * [Kjwon15](https://github.com/Kjwon15)
 * [Artoria2e5](https://github.com/Artoria2e5)
 * [yukimochi](https://github.com/yukimochi)
 * [marrus-sh](https://github.com/marrus-sh)
 * [krainboltgreene](https://github.com/krainboltgreene)
-* [patf](https://github.com/patf)
+* [renatolond](https://github.com/renatolond)
 * [Aldarone](https://github.com/Aldarone)
 * [BoFFire](https://github.com/BoFFire)
 * [clworld](https://github.com/clworld)
-* [dracos](https://github.com/dracos)
+* [danhunsaker](https://github.com/danhunsaker)
-* [SerCom_KC](mailto:sercom-kc@users.noreply.github.com)
+* [patf](https://github.com/patf)
-* [Sylvhem](https://github.com/Sylvhem)
+* [Quenty31](https://github.com/Quenty31)
-* [nightpool](https://github.com/nightpool)
+* [MitarashiDango](https://github.com/MitarashiDango)
-* [MasterGroosha](https://github.com/MasterGroosha)
+* [Aldarone](https://github.com/Aldarone)
 * [JeanGauthier](https://github.com/JeanGauthier)
 * [kschaper](https://github.com/kschaper)
-* [MaciekBaron](https://github.com/MaciekBaron)
+* [takayamaki](https://github.com/takayamaki)
 * [MitarashiDango](mailto:mitarashidango@users.noreply.github.com)
 * [beatrix-bitrot](https://github.com/beatrix-bitrot)
 * [adbelle](https://github.com/adbelle)
 * [evanminto](https://github.com/evanminto)
 * [mabkenar](https://github.com/mabkenar)
 * [MightyPork](https://github.com/MightyPork)
 * [beatrix-bitrot](https://github.com/beatrix-bitrot)
 * [yhirano55](https://github.com/yhirano55)
 * [camponez](https://github.com/camponez)
 * [SerCom-KC](https://github.com/SerCom-KC)
 * [aschmitz](https://github.com/aschmitz)
 * [devkral](https://github.com/devkral)
 * [fpiesche](https://github.com/fpiesche)
 * [gandaro](https://github.com/gandaro)
 * [johnsudaar](https://github.com/johnsudaar)
 * [trebmuh](https://github.com/trebmuh)
-* [Rakib Hasan](mailto:rmhasan@gmail.com)
+* [Sylvhem](https://github.com/Sylvhem)
 * [lindwurm](https://github.com/lindwurm)
 * [victorhck](mailto:victorhck@geeko.site)
 * [voidsatisfaction](https://github.com/voidsatisfaction)
 * [neetshin](https://github.com/neetshin)
 * [valentin2105](https://github.com/valentin2105)
 * [hikari-no-yume](https://github.com/hikari-no-yume)
-* [angristan](https://github.com/angristan)
+* [Angristan](https://github.com/Angristan)
 * [seefood](https://github.com/seefood)
 * [jackjennings](https://github.com/jackjennings)
-* [spla](mailto:spla@mastodont.cat)
+* [hcmiya](https://github.com/hcmiya)
 * [nightpool](https://github.com/nightpool)
 * [salvadorpla](https://github.com/salvadorpla)
 * [expenses](https://github.com/expenses)
 * [walf443](https://github.com/walf443)
 * [JoelQ](https://github.com/JoelQ)
@ -93,93 +84,74 @@ and provided thanks to the work of the following contributors:
 * [tsuwatch](https://github.com/tsuwatch)
 * [victorhck](https://github.com/victorhck)
 * [puckipedia](https://github.com/puckipedia)
 * [fvh-P](https://github.com/fvh-P)
 * [contraexemplo](https://github.com/contraexemplo)
 * [hugogameiro](https://github.com/hugogameiro)
 * [kazu9su](https://github.com/kazu9su)
 * [Komic](https://github.com/Komic)
 * [diomed](https://github.com/diomed)
 * [ariasuni](https://github.com/ariasuni)
 * [Neetshin](mailto:neetshin@neetsh.in)
 * [rainyday](https://github.com/rainyday)
 * [ProgVal](https://github.com/ProgVal)
 * [valentin2105](https://github.com/valentin2105)
 * [yuntan](https://github.com/yuntan)
 * [ashleyhull-versent](https://github.com/ashleyhull-versent)
 * [goofy-bz](mailto:goofy@babelzilla.org)
 * [kadiix](https://github.com/kadiix)
 * [kodacs](https://github.com/kodacs)
-* [rtucker](https://github.com/rtucker)
+* [ProgVal](https://github.com/ProgVal)
 * [KScl](https://github.com/KScl)
 * [sterdev](https://github.com/sterdev)
 * [TheKinrar](https://github.com/TheKinrar)
 * [AA4ch1](https://github.com/AA4ch1)
 * [alexgleason](https://github.com/alexgleason)
 * [cpytel](https://github.com/cpytel)
 * [northerner](https://github.com/northerner)
 * [fhemberger](https://github.com/fhemberger)
 * [greysteil](https://github.com/greysteil)
 * [hnrysmth](https://github.com/hnrysmth)
-* [d6rkaiz](https://github.com/d6rkaiz)
+* [hugogameiro](https://github.com/hugogameiro)
 * [JMendyk](https://github.com/JMendyk)
 * [JohnD28](https://github.com/JohnD28)
 * [znz](https://github.com/znz)
 * [Naouak](https://github.com/Naouak)
 * [rtucker](https://github.com/rtucker)
 * [reneklacan](https://github.com/reneklacan)
-* [ekiru](https://github.com/ekiru)
+* [KScl](https://github.com/KScl)
 * [SerCom-KC](https://github.com/SerCom-KC)
 * [tcitworld](https://github.com/tcitworld)
 * [geta6](https://github.com/geta6)
 * [goofy-bz](https://github.com/goofy-bz)
 * [happycoloredbanana](https://github.com/happycoloredbanana)
 * [kedamaDQ](https://github.com/kedamaDQ)
 * [leopku](https://github.com/leopku)
 * [SansPseudoFix](https://github.com/SansPseudoFix)
 * [tomfhowe](https://github.com/tomfhowe)
 * [noraworld](https://github.com/noraworld)
-* [theboss](https://github.com/theboss)
+* [fvh-P](https://github.com/fvh-P)
 * [178inaba](https://github.com/178inaba)
 * [devkral](https://github.com/devkral)
 * [alyssais](https://github.com/alyssais)
 * [kodnaplakal](https://github.com/kodnaplakal)
 * [stalker314314](https://github.com/stalker314314)
 * [huertanix](https://github.com/huertanix)
 * [genesixx](https://github.com/genesixx)
 * [fhemberger](https://github.com/fhemberger)
 * [halkeye](https://github.com/halkeye)
 * [hinaloe](https://github.com/hinaloe)
 * [treby](https://github.com/treby)
-* [Reverite](https://github.com/Reverite)
+* [d6rkaiz](https://github.com/d6rkaiz)
 * [jpdevries](https://github.com/jpdevries)
-* [H-C-F](https://github.com/H-C-F)
+* [rndm-stranger](https://github.com/rndm-stranger)
 * [Kurtis Rainbolt-Greene](mailto:me@kurtisrainboltgreene.name)
 * [saper](https://github.com/saper)
 * [nevillepark](https://github.com/nevillepark)
 * [ornithocoder](https://github.com/ornithocoder)
 * [pierreozoux](https://github.com/pierreozoux)
-* [qguv](https://github.com/qguv)
+* [ramlmn](https://github.com/ramlmn)
 * [Ram Lmn](mailto:ramlmn@users.noreply.github.com)
 * [harukasan](https://github.com/harukasan)
 * [stamak](https://github.com/stamak)
 * [Technowix](mailto:technowix@users.noreply.github.com)
 * [Eychics](https://github.com/Eychics)
-* [Thor Harald Johansen](mailto:thj@thj.no)
+* [thor-the-norseman](https://github.com/thor-the-norseman)
 * [0x70b1a5](https://github.com/0x70b1a5)
 * [gled-rs](https://github.com/gled-rs)
 * [Valentin_NC](mailto:valentin.ouvrard@nautile.sarl)
 * [R0ckweb](https://github.com/R0ckweb)
 * [caasi](https://github.com/caasi)
 * [esetomo](https://github.com/esetomo)
 * [foxiehkins](https://github.com/foxiehkins)
-* [hoodie](mailto:hoodiekitten@outlook.com)
+* [sdukhovni](https://github.com/sdukhovni)
 * [luzi82](https://github.com/luzi82)
 * [duxovni](https://github.com/duxovni)
 * [unsmell](https://github.com/unsmell)
 * [chriswmartin](https://github.com/chriswmartin)
 * [vahnj](https://github.com/vahnj)
 * [ikuradon](https://github.com/ikuradon)
 * [AndreLewin](https://github.com/AndreLewin)
 * [rinsuki](https://github.com/rinsuki)
 * [redtachyons](https://github.com/redtachyons)
 * [thurloat](https://github.com/thurloat)
 * [aaribaud](https://github.com/aaribaud)
 * [Andrew](mailto:andrewlchronister@gmail.com)
 * [estuans](https://github.com/estuans)
 * [dissolve](https://github.com/dissolve)
 * [PurpleBooth](https://github.com/PurpleBooth)
@ -193,46 +165,36 @@ and provided thanks to the work of the following contributors:
 * [farlistener](https://github.com/farlistener)
 * [DavidLibeau](https://github.com/DavidLibeau)
 * [SirCmpwn](https://github.com/SirCmpwn)
 * [MasterGroosha](https://github.com/MasterGroosha)
 * [Fjoerfoks](https://github.com/Fjoerfoks)
 * [fmauNeko](https://github.com/fmauNeko)
 * [gloaec](https://github.com/gloaec)
-* [Gomasy](https://github.com/Gomasy)
+* [greysteil](https://github.com/greysteil)
 * [unstabler](https://github.com/unstabler)
 * [potato4d](https://github.com/potato4d)
 * [h-izumi](https://github.com/h-izumi)
 * [ErikXXon](https://github.com/ErikXXon)
 * [ian-kelling](https://github.com/ian-kelling)
 * [immae](https://github.com/immae)
 * [foozmeat](https://github.com/foozmeat)
 * [jasonrhodes](https://github.com/jasonrhodes)
-* [Jason Snell](mailto:jason@newrelic.com)
+* [asm](https://github.com/asm)
 * [jviide](https://github.com/jviide)
 * [crakaC](https://github.com/crakaC)
 * [tkbky](https://github.com/tkbky)
 * [Kaylee](mailto:kaylee@codethat.sucks)
 * [Kazhnuz](https://github.com/Kazhnuz)
 * [connyduck](https://github.com/connyduck)
 * [Lindsey Bieda](mailto:lindseyb@users.noreply.github.com)
 * [Lorenz Diener](mailto:halcyon@icosahedron.website)
 * [alimony](https://github.com/alimony)
 * [mig5](https://github.com/mig5)
 * [ndarville](https://github.com/ndarville)
 * [Abzol](https://github.com/Abzol)
 * [pwoolcoc](https://github.com/pwoolcoc)
 * [xPaw](https://github.com/xPaw)
 * [petzah](https://github.com/petzah)
 * [ignisf](https://github.com/ignisf)
 * [raymestalez](https://github.com/raymestalez)
 * [sascha-sl](https://github.com/sascha-sl)
 * [u1-liquid](https://github.com/u1-liquid)
 * [sim6](https://github.com/sim6)
-* [stemid](https://github.com/stemid)
+* [ekiru](https://github.com/ekiru)
 * [Technowix](https://github.com/Technowix)
 * [ThomasLeister](https://github.com/ThomasLeister)
 * [mcat-ee](https://github.com/mcat-ee)
 * [tototoshi](https://github.com/tototoshi)
 * [TrashMacNugget](https://github.com/TrashMacNugget)
 * [VirtuBox](https://github.com/VirtuBox)
 * [Vladyslav](mailto:vaden@tuta.io)
 * [kaniini](https://github.com/kaniini)
 * [vayan](https://github.com/vayan)
 * [yannicka](https://github.com/yannicka)
@ -240,12 +202,7 @@ and provided thanks to the work of the following contributors:
 * [zacanger](https://github.com/zacanger)
 * [amazedkoumei](https://github.com/amazedkoumei)
 * [anon5r](https://github.com/anon5r)
 * [aus-social](https://github.com/aus-social)
 * [imbsky](https://github.com/imbsky)
 * [bsky](mailto:me@imbsky.net)
 * [chr-1x](https://github.com/chr-1x)
 * [codl](https://github.com/codl)
 * [cpsdqs](https://github.com/cpsdqs)
 * [barzamin](https://github.com/barzamin)
 * [fhalna](https://github.com/fhalna)
 * [haoyayoi](https://github.com/haoyayoi)
@ -258,55 +215,42 @@ and provided thanks to the work of the following contributors:
 * [oliverkeeble](https://github.com/oliverkeeble)
 * [pinfort](https://github.com/pinfort)
 * [rbaumert](https://github.com/rbaumert)
 * [rhoio](https://github.com/rhoio)
 * [trwnh](https://github.com/trwnh)
 * [usagi-f](https://github.com/usagi-f)
 * [vidarlee](https://github.com/vidarlee)
 * [vjackson725](https://github.com/vjackson725)
 * [wxcafe](https://github.com/wxcafe)
-* [新都心(Neet Shin)](mailto:nucx@dio-vox.com)
+* [rinsuki](https://github.com/rinsuki)
 * [cygnan](https://github.com/cygnan)
 * [Awea](https://github.com/Awea)
 * [halcy](https://github.com/halcy)
-* [naaaaaaaaaaaf](https://github.com/naaaaaaaaaaaf)
+* [bounshi](https://github.com/bounshi)
 * [NecroTechno](https://github.com/NecroTechno)
 * [8398a7](https://github.com/8398a7)
 * [857b](https://github.com/857b)
 * [insom](https://github.com/insom)
 * [Aditoo17](https://github.com/Aditoo17)
 * [unascribed](https://github.com/unascribed)
 * [Aguay-val](https://github.com/Aguay-val)
 * [Akihiko Odaki](mailto:nekomanma@pixiv.co.jp)
 * [knu](https://github.com/knu)
 * [h3poteto](https://github.com/h3poteto)
 * [unleashed](https://github.com/unleashed)
 * [alxrcs](https://github.com/alxrcs)
 * [console-cowboy](https://github.com/console-cowboy)
 * [pointlessone](https://github.com/pointlessone)
 * [a2](https://github.com/a2)
 * [0xa](https://github.com/0xa)
 * [palindromordnilap](https://github.com/palindromordnilap)
 * [virtualpain](https://github.com/virtualpain)
 * [sapphirus](https://github.com/sapphirus)
 * [amandavisconti](https://github.com/amandavisconti)
 * [ameliavoncat](https://github.com/ameliavoncat)
 * [ilpianista](https://github.com/ilpianista)
-* [Andreas Drop](mailto:andy@remline.de)
+* [andydrop](https://github.com/andydrop)
 * [andi1984](https://github.com/andi1984)
 * [schas002](https://github.com/schas002)
 * [abackstrom](https://github.com/abackstrom)
 * [jumbosushi](https://github.com/jumbosushi)
 * [ayumin](https://github.com/ayumin)
 * [BaptisteGelez](https://github.com/BaptisteGelez)
 * [bzg](https://github.com/bzg)
 * [BenLubar](https://github.com/BenLubar)
 * [benediktg](https://github.com/benediktg)
 * [blakebarnett](https://github.com/blakebarnett)
 * [bradj](https://github.com/bradj)
 * [brycied00d](https://github.com/brycied00d)
 * [carlosjs23](https://github.com/carlosjs23)
 * [cgxxx](https://github.com/cgxxx)
 * [kibitan](https://github.com/kibitan)
 * [chrisheninger](https://github.com/chrisheninger)
 * [chris-martin](https://github.com/chris-martin)
 * [DoubleMalt](https://github.com/DoubleMalt)
@ -315,33 +259,22 @@ and provided thanks to the work of the following contributors:
 * [chriswk](https://github.com/chriswk)
 * [csu](https://github.com/csu)
 * [kklleemm](https://github.com/kklleemm)
-* [colindean](https://github.com/colindean)
+* [monsterpit-daggertooth](https://github.com/monsterpit-daggertooth)
 * [dachinat](https://github.com/dachinat)
 * [multiple-creatures](https://github.com/multiple-creatures)
 * [watilde](https://github.com/watilde)
 * [daprice](https://github.com/daprice)
 * [dar5hak](https://github.com/dar5hak)
 * [kant](https://github.com/kant)
 * [maxolasersquad](https://github.com/maxolasersquad)
 * [singingwolfboy](https://github.com/singingwolfboy)
 * [davidcelis](https://github.com/davidcelis)
 * [davefp](https://github.com/davefp)
 * [yipdw](https://github.com/yipdw)
 * [debanshuk](https://github.com/debanshuk)
 * [Derek Lewis](mailto:derekcecillewis@gmail.com)
 * [dblandin](https://github.com/dblandin)
-* [Drew Gates](mailto:aranaur@users.noreply.github.com)
+* [aranaur](https://github.com/aranaur)
 * [dtschust](https://github.com/dtschust)
 * [Dryusdan](https://github.com/Dryusdan)
 * [eai04191](https://github.com/eai04191)
 * [d3vgru](https://github.com/d3vgru)
 * [Elizafox](https://github.com/Elizafox)
 * [ericblade](https://github.com/ericblade)
 * [mikoim](https://github.com/mikoim)
 * [espenronnevik](https://github.com/espenronnevik)
 * [Finariel](https://github.com/Finariel)
 * [siuying](https://github.com/siuying)
 * [GenbuHase](https://github.com/GenbuHase)
 * [hattori6789](https://github.com/hattori6789)
 * [algernon](https://github.com/algernon)
 * [Fastbyte01](https://github.com/Fastbyte01)
@ -350,62 +283,52 @@ and provided thanks to the work of the following contributors:
 * [Fiaxhs](https://github.com/Fiaxhs)
 * [reedcourty](https://github.com/reedcourty)
 * [anneau](https://github.com/anneau)
 * [lanodan](https://github.com/lanodan)
 * [Harmon758](https://github.com/Harmon758)
 * [HellPie](https://github.com/HellPie)
 * [Habu-Kagumba](https://github.com/Habu-Kagumba)
 * [hinaloe](https://github.com/hinaloe)
 * [suzukaze](https://github.com/suzukaze)
 * [Hiromi-Kai](https://github.com/Hiromi-Kai)
 * [hishamhm](https://github.com/hishamhm)
 * [musashino205](https://github.com/musashino205)
 * [iwaim](https://github.com/iwaim)
 * [valrus](https://github.com/valrus)
 * [IMcD23](https://github.com/IMcD23)
 * [yi0713](https://github.com/yi0713)
 * [immae](https://github.com/immae)
 * [iblech](https://github.com/iblech)
 * [usbsnowcrash](https://github.com/usbsnowcrash)
 * [jack-michaud](https://github.com/jack-michaud)
 * [Floppy](https://github.com/Floppy)
 * [loomchild](https://github.com/loomchild)
-* [jenkr55](https://github.com/jenkr55)
+* [docjkl](https://github.com/docjkl)
 * [press5](https://github.com/press5)
 * [TrollDecker](https://github.com/TrollDecker)
 * [jmontane](https://github.com/jmontane)
 * [jonathanklee](https://github.com/jonathanklee)
 * [jguerder](https://github.com/jguerder)
 * [Jehops](https://github.com/Jehops)
 * [joshuap](https://github.com/joshuap)
 * [YuleZ](https://github.com/YuleZ)
 * [Tiwy57](https://github.com/Tiwy57)
 * [xuv](https://github.com/xuv)
 * [Jnsll](https://github.com/Jnsll)
 * [j0k3r](https://github.com/j0k3r)
 * [KEINOS](https://github.com/KEINOS)
 * [futoase](https://github.com/futoase)
-* [Pneumaticat](https://github.com/Pneumaticat)
+* [abjectio](https://github.com/abjectio)
 * [Kit Redgrave](mailto:qwertyitis@gmail.com)
 * [Knut Erik](mailto:abjectio@users.noreply.github.com)
 * [mkody](https://github.com/mkody)
 * [connyduck](https://github.com/connyduck)
 * [k0ta0uchi](https://github.com/k0ta0uchi)
 * [KrzysiekJ](https://github.com/KrzysiekJ)
 * [leowzukw](https://github.com/leowzukw)
 * [lmorchard](https://github.com/lmorchard)
 * [Tak](https://github.com/Tak)
 * [cacheflow](https://github.com/cacheflow)
 * [ldidry](https://github.com/ldidry)
 * [jemus42](https://github.com/jemus42)
 * [lfuelling](https://github.com/lfuelling)
 * [Grabacr07](https://github.com/Grabacr07)
 * [mistermantas](https://github.com/mistermantas)
 * [mareklach](https://github.com/mareklach)
 * [wirehack7](https://github.com/wirehack7)
 * [martymcguire](https://github.com/martymcguire)
 * [marvinkopf](https://github.com/marvinkopf)
 * [otsune](https://github.com/otsune)
-* [Mathias B](mailto:10813340+mathias-b@users.noreply.github.com)
+* [m-blc](https://github.com/m-blc)
 * [matt-auckland](https://github.com/matt-auckland)
 * [webroo](https://github.com/webroo)
 * [matthiasbeyer](https://github.com/matthiasbeyer)
 * [mattjmattj](https://github.com/mattjmattj)
 * [mtparet](https://github.com/mtparet)
 * [maximeborges](https://github.com/maximeborges)
@ -413,20 +336,16 @@ and provided thanks to the work of the following contributors:
 * [michaeljdeeb](https://github.com/michaeljdeeb)
 * [Themimitoof](https://github.com/Themimitoof)
 * [cyweo](https://github.com/cyweo)
-* [Midgard](mailto:m1dgard@users.noreply.github.com)
+* [M1dgard](https://github.com/M1dgard)
 * [mike-burns](https://github.com/mike-burns)
 * [verymilan](https://github.com/verymilan)
 * [milmazz](https://github.com/milmazz)
 * [premist](https://github.com/premist)
 * [Mnkai](https://github.com/Mnkai)
 * [mitchhentges](https://github.com/mitchhentges)
 * [moritzheiber](https://github.com/moritzheiber)
 * [mouse-reeve](https://github.com/mouse-reeve)
 * [Mozinet-fr](https://github.com/Mozinet-fr)
 * [lae](https://github.com/lae)
 * [Nanamachi](https://github.com/Nanamachi)
 * [orinthe](https://github.com/orinthe)
 * [Dar13](https://github.com/Dar13)
 * [ngerakines](https://github.com/ngerakines)
 * [vonneudeck](https://github.com/vonneudeck)
 * [Ninetailed](https://github.com/Ninetailed)
@ -436,23 +355,18 @@ and provided thanks to the work of the following contributors:
 * [norayr](https://github.com/norayr)
 * [joyeusenoelle](https://github.com/joyeusenoelle)
 * [OlivierNicole](https://github.com/OlivierNicole)
 * [noppa](https://github.com/noppa)
 * [Otakan951](https://github.com/Otakan951)
 * [fahy](https://github.com/fahy)
 * [PatrickRWells](https://github.com/PatrickRWells)
 * [Pangoraw](https://github.com/Pangoraw)
 * [pwoolcoc](https://github.com/pwoolcoc)
 * [peterkeen](https://github.com/peterkeen)
-* [pgate](https://github.com/pgate)
+* [petzah](https://github.com/petzah)
-* [remram44](https://github.com/remram44)
+* [ignisf](https://github.com/ignisf)
 * [retokromer](https://github.com/retokromer)
 * [rfwatson](https://github.com/rfwatson)
 * [rfreebern](https://github.com/rfreebern)
 * [Ryan Wade](mailto:ryan.wade@protonmail.com)
 * [sylph01](https://github.com/sylph01)
 * [S-H-GAMELINKS](https://github.com/S-H-GAMELINKS)
 * [staticsafe](https://github.com/staticsafe)
 * [snwh](https://github.com/snwh)
 * [sts10](https://github.com/sts10)
 * [skoji](https://github.com/skoji)
 * [ScienJus](https://github.com/ScienJus)
 * [larkinscott](https://github.com/larkinscott)
@ -464,103 +378,73 @@ and provided thanks to the work of the following contributors:
 * [ernix](https://github.com/ernix)
 * [rosylilly](https://github.com/rosylilly)
 * [shouko](https://github.com/shouko)
 * [Sina Mashek](mailto:sina@mashek.xyz)
 * [sossii](https://github.com/sossii)
-* [Spanky](mailto:2788886+spankyworks@users.noreply.github.com)
+* [StefOfficiel](https://github.com/StefOfficiel)
-* [StefOfficiel](mailto:pichard.stephane@free.fr)
+* [svetlik](https://github.com/svetlik)
-* [Svetlozar Todorov](mailto:svetlik@users.noreply.github.com)
+* [dereckson](https://github.com/dereckson)
-* [Sébastien Santoro](mailto:dereckson@espace-win.org)
+* [theboss](https://github.com/theboss)
-* [Tad Thorley](mailto:phaedryx@users.noreply.github.com)
+* [takp](https://github.com/takp)
-* [Takayoshi Nishida](mailto:takayoshi.nishida@gmail.com)
+* [tkusano](https://github.com/tkusano)
-* [Takayuki KUSANO](mailto:github@tkusano.jp)
+* [TheInventrix](https://github.com/TheInventrix)
-* [TakesxiSximada](mailto:takesxi.sximada@gmail.com)
+* [shug0](https://github.com/shug0)
-* [TheInventrix](mailto:theinventrix@users.noreply.github.com)
+* [Fortyseven](https://github.com/Fortyseven)
-* [Thomas Alberola](mailto:thomas@needacoffee.fr)
+* [tobypinder](https://github.com/tobypinder)
-* [Toby Deshane](mailto:fortyseven@users.noreply.github.com)
+* [tomosm](https://github.com/tomosm)
-* [Toby Pinder](mailto:gigitrix@gmail.com)
+* [TomoyaShibata](https://github.com/TomoyaShibata)
-* [Tomonori Murakami](mailto:crosslife777@gmail.com)
+* [TrashMacNugget](https://github.com/TrashMacNugget)
-* [TomoyaShibata](mailto:wind.of.hometown@gmail.com)
+* [treyssatvincent](https://github.com/treyssatvincent)
-* [Treyssat-Vincent Nino](mailto:treyssatvincent@users.noreply.github.com)
+* [optikfluffel](https://github.com/optikfluffel)
-* [Udo Kramer](mailto:optik@fluffel.io)
+* [vmincev](https://github.com/vmincev)
-* [Una](mailto:una@unascribed.com)
+* [waldyrious](https://github.com/waldyrious)
-* [Ushitora Anqou](mailto:ushitora_anqou@yahoo.co.jp)
+* [tahnok](https://github.com/tahnok)
-* [Valentin Lorentz](mailto:progval+git@progval.net)
+* [YDrogen](https://github.com/YDrogen)
-* [Vladimir Mincev](mailto:vladimir@canicinteractive.com)
+* [YOSHIOKAEiichiro](https://github.com/YOSHIOKAEiichiro)
-* [Waldir Pimenta](mailto:waldyrious@gmail.com)
+* [S-YOU](https://github.com/S-YOU)
-* [Wesley Ellis](mailto:tahnok@gmail.com)
+* [YaQ00](https://github.com/YaQ00)
-* [Wiktor](mailto:wiktor@metacode.biz)
+* [yanakend](https://github.com/yanakend)
-* [Wonderfall](mailto:wonderfall@schrodinger.io)
+* [orzFly](https://github.com/orzFly)
-* [YDrogen](mailto:ydrogen45@gmail.com)
+* [chansuke](https://github.com/chansuke)
-* [YMHuang](mailto:ymhuang@fmbase.tw)
+* [yuntan](https://github.com/yuntan)
-* [YOSHIOKA Eiichiro](mailto:yoshioka.eiichiro@gmail.com)
+* [LogicalDash](https://github.com/LogicalDash)
-* [YOU](mailto:stackexchange.you@gmail.com)
+* [ZiiX](https://github.com/ZiiX)
-* [YaQ](mailto:i_k_o_m_a_7@yahoo.co.jp)
+* [benklop](https://github.com/benklop)
-* [Yanaken](mailto:yanakend@gmail.com)
+* [caasi](https://github.com/caasi)
-* [Yann Klis](mailto:yann.klis@gmail.com)
+* [caesarologia](https://github.com/caesarologia)
-* [Yeechan Lu](mailto:wz.bluesnow@gmail.com)
+* [chrolis](https://github.com/chrolis)
-* [Yusuke Abe](mailto:moonset20@gmail.com)
+* [cormojs](https://github.com/cormojs)
-* [Zachary Spector](mailto:logicaldash@gmail.com)
+* [cpsdqs](https://github.com/cpsdqs)
-* [ZiiX](mailto:ziix@users.noreply.github.com)
+* [d0p1s4m4](https://github.com/d0p1s4m4)
-* [asria-jp](mailto:is@alicematic.com)
+* [evilny0](https://github.com/evilny0)
-* [ava](mailto:vladooku@users.noreply.github.com)
+* [febrezo](https://github.com/febrezo)
-* [benklop](mailto:benklop@gmail.com)
+* [fsubal](https://github.com/fsubal)
-* [bsky](mailto:git@imbsky.net)
+* [dikky1218](https://github.com/dikky1218)
-* [caesarologia](mailto:lopesgemelli.1@gmail.com)
+* [gentarok](https://github.com/gentarok)
-* [cbayerlein](mailto:c.bayerlein@gmail.com)
+* [hakoai](https://github.com/hakoai)
-* [chrolis](mailto:chrolis@users.noreply.github.com)
+* [chaosbunker](https://github.com/chaosbunker)
-* [cormo](mailto:cormorant2+github@gmail.com)
+* [isati](https://github.com/isati)
-* [d0p1](mailto:dopi-sama@hush.com)
+* [jkap](https://github.com/jkap)
-* [evilny0](mailto:evilny0@moomoocamp.net)
+* [jirayudech](https://github.com/jirayudech)
-* [febrezo](mailto:felixbrezo@gmail.com)
+* [jukper](https://github.com/jukper)
-* [fsubal](mailto:fsubal@users.noreply.github.com)
+* [karlyeurl](https://github.com/karlyeurl)
-* [fusshi-](mailto:dikky1218@users.noreply.github.com)
+* [kedamaDQ](https://github.com/kedamaDQ)
-* [gentaro](mailto:gentaroooo@gmail.com)
+* [kuro5hin](https://github.com/kuro5hin)
-* [hakoai](mailto:hk--76@qa2.so-net.ne.jp)
+* [maxypy](https://github.com/maxypy)
-* [haosbvnker](mailto:github@chaosbunker.com)
+* [marcus-herrmann](https://github.com/marcus-herrmann)
-* [isati](mailto:phil@juchnowi.cz)
+* [mshrtkch](https://github.com/mshrtkch)
-* [jacob](mailto:jacobherringtondeveloper@gmail.com)
+* [muan](https://github.com/muan)
-* [jenn kaplan](mailto:me@jkap.io)
+* [rch850](https://github.com/rch850)
-* [jirayudech](mailto:jirayudech@gmail.com)
+* [roikale](https://github.com/roikale)
-* [jooops](mailto:joops@autistici.org)
+* [rysiekpl](https://github.com/rysiekpl)
-* [jukper](mailto:jukkaperanto@gmail.com)
+* [saturday06](https://github.com/saturday06)
-* [jumoru](mailto:jumoru@mailbox.org)
+* [scriptjunkie](https://github.com/scriptjunkie)
-* [karlyeurl](mailto:karl.yeurl@gmail.com)
+* [seekr](https://github.com/seekr)
-* [kedama](mailto:32974885+kedamadq@users.noreply.github.com)
+* [syui](https://github.com/syui)
-* [kuro5hin](mailto:rusty@kuro5hin.org)
+* [tackeyy](https://github.com/tackeyy)
-* [luzpaz](mailto:luzpaz@users.noreply.github.com)
+* [tmyt](https://github.com/tmyt)
-* [maxypy](mailto:maxime@mpigou.fr)
+* [utam0k](https://github.com/utam0k)
-* [mhe](mailto:mail@marcus-herrmann.com)
+* [vpzomtrrfrt](https://github.com/vpzomtrrfrt)
-* [mimikun](mailto:dzdzble_effort_311@outlook.jp)
+* [walfie](https://github.com/walfie)
-* [mshrtkch](mailto:mshrtkch@users.noreply.github.com)
+* [y-temp4](https://github.com/y-temp4)
-* [muan](mailto:muan@github.com)
+* [ymmtmdk](https://github.com/ymmtmdk)
 * [neetshin](mailto:neetshin@neetsh.in)
 * [nightpool](mailto:nightpool@users.noreply.github.com)
 * [rch850](mailto:rich850@gmail.com)
 * [roikale](mailto:roikale@users.noreply.github.com)
 * [rysiekpl](mailto:rysiek@hackerspace.pl)
 * [saturday06](mailto:dyob@lunaport.net)
 * [scriptjunkie](mailto:scriptjunkie@scriptjunkie.us)
 * [seekr](mailto:mario.drs@gmail.com)
 * [sundevour](mailto:31990469+sundevour@users.noreply.github.com)
 * [syui](mailto:syui@users.noreply.github.com)
 * [tackeyy](mailto:mailto.takita.yusuke@gmail.com)
 * [tateisu](mailto:tateisu@gmail.com)
 * [tmyt](mailto:shigure@refy.net)
 * [trevDev()](mailto:trev@trevdev.ca)
 * [utam0k](mailto:k0ma@utam0k.jp)
 * [vpzomtrrfrt](mailto:vpzomtrrfrt@gmail.com)
 * [walfie](mailto:walfington@gmail.com)
 * [y-temp4](mailto:y.temp4@gmail.com)
 * [ymmtmdk](mailto:ymmtmdk@gmail.com)
 * [yoshipc](mailto:yoooo@yoshipc.net)
 * [Özcan Zafer AYAN](mailto:ozcanzaferayan@gmail.com)
 * [ばん](mailto:detteiu0321@gmail.com)
 * [みたらしだんご](mailto:mitarashidango@users.noreply.github.com)
 * [りんすき](mailto:6533808+rinsuki@users.noreply.github.com)
 * [ヨイツの賢狼ホロ | 3rd style](mailto:horo@yoitsu.moe)
 * [猫吸血鬼ディフリス / 猫ロキP](mailto:deflis@gmail.com)
 * [艮 鮟鱇](mailto:ushitora_anqou@yahoo.co.jp)
 * [西小倉宏信](mailto:nishiko@mindia.jp)
 * [雨宮美羽](mailto:k737566@gmail.com)
 This document is provided for informational purposes only. Since it is only updated once per release, the version you are looking at may be currently out of date. To see the full list of contributors, consider looking at the [git history](https://github.com/tootsuite/mastodon/graphs/contributors) instead.
--- a/17
+++ b/17
@ -10,20 +10,3 @@ libxdamage1
 libxfixes3
 protobuf-compiler
 zlib1g-dev
 libcairo2
 libcroco3
 libdatrie1
 libgdk-pixbuf2.0-0
 libgraphite2-3
 libharfbuzz0b
 libpango-1.0-0
 libpangocairo-1.0-0
 libpangoft2-1.0-0
 libpixman-1-0
 librsvg2-2
 libthai-data
 libthai0
 libvpx5
 libxcb-render0
 libxcb-shm0
 libxrender1
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,134 +0,0 @@
 Changelog
 =========
 All notable changes to this project will be documented in this file.
 ## [2.6.1] - 2018-10-30
 ### Fixed
 - Fix resolving resources by URL not working due to a regression in #9132 (#9171)
 - Fix reducer error in web UI when a conversation has no last status (#9173)
 ## [2.6.0] - 2018-10-30
 ### Added
 - Add link ownership verification (#8703)
 - Add conversations API (#8832)
 - Add limit for the number of people that can be followed from one account (#8807)
 - Add admin setting to customize mascot (#8766)
 - Add support for more granular ActivityPub audiences from other software, i.e. circles (#8950, #9093, #9150)
 - Add option to block all reports from a domain (#8830)
 - Add user preference to always expand toots marked with content warnings (#8762)
 - Add user preference to always hide all media (#8569)
 - Add `force_login` param to OAuth authorize page (#8655)
 - Add `tootctl accounts backup` (#8642, #8811)
 - Add `tootctl accounts create` (#8642, #8811)
 - Add `tootctl accounts cull` (#8642, #8811)
 - Add `tootctl accounts delete` (#8642, #8811)
 - Add `tootctl accounts modify` (#8642, #8811)
 - Add `tootctl accounts refresh` (#8642, #8811)
 - Add `tootctl feeds build` (#8642, #8811)
 - Add `tootctl feeds clear` (#8642, #8811)
 - Add `tootctl settings registrations open` (#8642, #8811)
 - Add `tootctl settings registrations close` (#8642, #8811)
 - Add `min_id` param to REST API to support backwards pagination (#8736)
 - Add a confirmation dialog when hitting reply and the compose box isn't empty (#8893)
 - Add PostgreSQL disk space growth tracking in PGHero (#8906)
 - Add button for disabling local account to report quick actions bar (#9024)
 - Add Czech language (#8594)
 - Add `same-site` (`lax`) attribute to cookies (#8626)
 - Add support for styled scrollbars in Firefox Nightly (#8653)
 - Add highlight to the active tab in web UI profiles (#8673)
 - Add auto-focus for comment textarea in report modal (#8689)
 - Add auto-focus for emoji picker's search field (#8688)
 - Add nginx and systemd templates to `dist/` directory (#8770)
 - Add support for `/.well-known/change-password` (#8828)
 - Add option to override FFMPEG binary path (#8855)
 - Add `dns-prefetch` tag when using different host for assets or uploads (#8942)
 - Add `description` meta tag (#8941)
 - Add `Content-Security-Policy` header (#8957)
 - Add cache for the instance info API (#8765)
 - Add suggested follows to search screen in mobile layout (#9010)
 - Add CORS header to `/.well-known/*` routes (#9083)
 - Add `card` attribute to statuses returned from REST API (#9120)
 - Add in-stream link preview (#9120)
 - Add support for ActivityPub `Page` objects (#9121)
 ### Changed
 - Change forms design (#8703)
 - Change reports overview to group by target account (#8674)
 - Change web UI to show "read more" link on overly long in-stream statuses (#8205)
 - Change design of direct messages column (#8832, #9022)
 - Change home timelines to exclude DMs (#8940)
 - Change list timelines to exclude all replies (#8683)
 - Change admin accounts UI default sort to most recent (#8813)
 - Change documentation URL in the UI (#8898)
 - Change style of success and failure messages (#8973)
 - Change DM filtering to always allow DMs from staff (#8993)
 - Change recommended Ruby version to 2.5.3 (#9003)
 - Change docker-compose default to persist volumes in current directory (#9055)
 - Change character counters on edit profile page to input length limit (#9100)
 - Change notification filtering to always let through messages from staff (#9152)
 - Change "hide boosts from user" function also hiding notifications about boosts (#9147)
 - Change CSS `detailed-status__wrapper` class actually wrap the detailed status (#8547)
 ### Deprecated
 - `GET /api/v1/timelines/direct` → `GET /api/v1/conversations` (#8832)
 - `POST /api/v1/notifications/dismiss` → `POST /api/v1/notifications/:id/dismiss` (#8905)
 - `GET /api/v1/statuses/:id/card` → `card` attributed included in status (#9120)
 ### Removed
 - Remove "on this device" label in column push settings (#8704)
 - Remove rake tasks in favour of tootctl commands (#8675)
 ### Fixed
 - Fix remote statuses using instance's default locale if no language given (#8861)
 - Fix streaming API not exiting when port or socket is unavailable (#9023)
 - Fix network calls being performed in database transaction in ActivityPub handler (#8951)
 - Fix dropdown arrow position (#8637)
 - Fix first element of dropdowns being focused even if not using keyboard (#8679)
 - Fix tootctl requiring `bundle exec` invocation (#8619)
 - Fix public pages not using animation preference for avatars (#8614)
 - Fix OEmbed/OpenGraph cards not understanding relative URLs (#8669)
 - Fix some dark emojis not having a white outline (#8597)
 - Fix media description not being displayed in various media modals (#8678)
 - Fix generated URLs of desktop notifications missing base URL (#8758)
 - Fix RTL styles (#8764, #8767, #8823, #8897, #9005, #9007, #9018, #9021, #9145, #9146)
 - Fix crash in streaming API when tag param missing (#8955)
 - Fix hotkeys not working when no element is focused (#8998)
 - Fix some hotkeys not working on detailed status view (#9006)
 - Fix og:url on status pages (#9047)
 - Fix upload option buttons only being visible on hover (#9074)
 - Fix tootctl not returning exit code 1 on wrong arguments (#9094)
 - Fix preview cards for appearing for profiles mentioned in toot (#6934, #9158)
 - Fix local accounts sometimes being duplicated as faux-remote (#9109)
 - Fix emoji search when the shortcode has multiple separators (#9124)
 - Fix dropdowns sometimes being partially obscured by other elements (#9126)
 - Fix cache not updating when reply/boost/favourite counters or media sensitivity update (#9119)
 - Fix empty display name precedence over username in web UI (#9163)
 - Fix td instead of th in sessions table header (#9162)
 - Fix handling of content types with profile (#9132)
 ## [2.5.2] - 2018-10-12
 ### Security
 - Fix XSS vulnerability (#8959)
 ## [2.5.1] - 2018-10-07
 ### Fixed
 - Fix database migrations for PostgreSQL below 9.5 (#8903)
 - Fix class autoloading issue in ActivityPub Create handler (#8820)
 - Fix cache statistics not being sent via statsd when statsd enabled (#8831)
 - Bump puma from 3.11.4 to 3.12.0 (#8883)
 ### Security
 - Fix some local images not having their EXIF metadata stripped on upload (#8714)
 - Fix being able to enable a disabled relay via ActivityPub Accept handler (#8864)
 - Bump nokogiri from 1.8.4 to 1.8.5 (#8881)
 - Fix being able to report statuses not belonging to the reported account (#8916)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -1,37 +1,56 @@
-Contributing
+CONTRIBUTING
 ============
-Thank you for considering contributing to Mastodon 🐘 
+There are three ways in which you can contribute to this repository:
-You can contribute in the following ways:
+1. By improving the documentation
 2. By working on the back-end application
 3. By working on the front-end application
- Finding and reporting bugs
+Choosing what to work on in a large open source project is not easy. The list of [GitHub issues](https://github.com/tootsuite/mastodon/issues) may provide some ideas, but not every feature request has been greenlit. Likewise, not every change or feature that resolves a personal itch will be merged into the main repository. Some communication ahead of time may be wise. If your addition creates a new feature or setting, or otherwise changes how things work in some substantial way, please remember to submit a correlating pull request to document your changes in the [documentation](http://github.com/tootsuite/documentation).
 - Translating the Mastodon interface into various languages
 - Contributing code to Mastodon by fixing bugs or implementing features
 - Improving the documentation
-## Bug reports
+Below are the guidelines for working on pull requests:
-Bug reports and feature suggestions can be submitted to [GitHub Issues](https://github.com/tootsuite/mastodon/issues). Please make sure that you are not submitting duplicates, and that a similar report or request has not already been resolved or rejected in the past using the search function. Please also use descriptive, concise titles.
+## General
-## Translations
+- 2 spaces indentation
 You can submit translations via [Weblate](https://weblate.joinmastodon.org/). They are periodically merged into the codebase.
 [![Mastodon translation statistics by language](https://weblate.joinmastodon.org/widgets/mastodon/-/multi-auto.svg)](https://weblate.joinmastodon.org/)
 ## Pull requests
 Please use clean, concise titles for your pull requests. We use commit squashing, so the final commit in the master branch will carry the title of the pull request.
 The smaller the set of changes in the pull request is, the quicker it can be reviewed and merged. Splitting tasks into multiple smaller pull requests is often preferable.
 **Pull requests that do not pass automated checks may not be reviewed**. In particular, you need to keep in mind:
 - Unit and integration tests (rspec, jest)
 - Code style rules (rubocop, eslint)
 - Normalization of locale files (i18n-tasks)
 ## Documentation
-The [Mastodon documentation](https://docs.joinmastodon.org) is a statically generated site. You can [submit merge requests to mastodon/docs](https://source.joinmastodon.org/mastodon/docs).
+- No spelling mistakes
 - No orthographic mistakes
 - No Markdown syntax errors
 ## Requirements
 - Ruby
 - Node.js
 - PostgreSQL
 - Redis
 - Nginx (optional)
 ## Back-end application
 It is expected that you have a working development environment set up. The development environment includes [rubocop](https://github.com/bbatsov/rubocop), which checks your Ruby code for compliance with our style guide and best practices. Sublime Text, likely like other editors, has a [Rubocop plugin](https://github.com/pderichs/sublime_rubocop) that runs checks on files as you edit them. The codebase also has a test suite.
 * The codebase is not perfect, at the time of writing, but it is expected that you do not introduce new code style violations
 * The rspec test suite must pass
 * To the extent that it is possible, verify your changes. In the best case, by adding new tests to the test suite. At the very least, by running the server or console and checking it manually
 * If you are introducing new strings to the user interface, they must be using localization methods
 If your code has syntax errors that won't let it run, it's a good sign that the pull request isn't ready for submission yet.
 ## Front-end application
 It is expected that you have a working development environment set up (see back-end application section). This project includes an ESLint configuration file, with which you can lint your changes.
 * Avoid grave ESLint violations
 * Verify that your changes work
 * If you are introducing new strings, they must be using localization methods
 If the JavaScript or CSS assets won't compile due to a syntax error, it's a good sign that the pull request isn't ready for submission yet.
 ## Translate
 You can contribute to translating Mastodon via Weblate at [weblate.joinmastodon.org](https://weblate.joinmastodon.org/).
 [![Mastodon translation statistics by language](https://weblate.joinmastodon.org/widgets/mastodon/-/multi-auto.svg)](https://weblate.joinmastodon.org/)
--- a/4
+++ b/4
@ -1,5 +1,5 @@
-FROM node:8.12.0-alpine as node
+FROM node:8.11.3-alpine as node
-FROM ruby:2.4.5-alpine3.8
+FROM ruby:2.4.4-alpine3.6
 LABEL maintainer="https://github.com/tootsuite/mastodon" \
      description="Your self-hosted, globally interconnected microblogging community"
--- a/71
+++ b/71
@ -5,36 +5,36 @@ ruby '>= 2.3.0', '< 2.6.0'
 gem 'pkg-config', '~> 1.3'
-gem 'puma', '~> 3.12'
+gem 'puma', '~> 3.11'
 gem 'rails', '~> 5.2.1'
 gem 'thor', '~> 0.20'
 gem 'hamlit-rails', '~> 0.2'
-gem 'pg', '~> 1.1'
+gem 'pg', '~> 1.0'
 gem 'makara', '~> 0.4'
-gem 'pghero', '~> 2.2'
+gem 'pghero', '~> 2.1'
-gem 'dotenv-rails', '~> 2.5'
+gem 'dotenv-rails', '~> 2.2', '< 2.3'
-gem 'aws-sdk-s3', '~> 1.23', require: false
+gem 'aws-sdk-s3', '~> 1.9', require: false
-gem 'fog-core', '<= 2.1.0'
+gem 'fog-core', '~> 1.45'
-gem 'fog-openstack', '~> 0.3', require: false
+gem 'fog-openstack', '~> 0.1', require: false
 gem 'paperclip', '~> 6.0'
 gem 'paperclip-av-transcoder', '~> 0.6'
 gem 'streamio-ffmpeg', '~> 3.0'
 gem 'active_model_serializers', '~> 0.10'
 gem 'addressable', '~> 2.5'
-gem 'bootsnap', '~> 1.3', require: false
+gem 'bootsnap', '~> 1.3'
 gem 'browser'
 gem 'charlock_holmes', '~> 0.7.6'
 gem 'iso-639'
 gem 'chewy', '~> 5.0'
 gem 'cld3', '~> 3.2.0'
-gem 'devise', '~> 4.5'
+gem 'devise', '~> 4.4'
 gem 'devise-two-factor', '~> 3.0'
 group :pam_authentication, optional: true do
-  gem 'devise_pam_authenticatable2', '~> 9.2'
+  gem 'devise_pam_authenticatable2', '~> 9.1'
 end
 gem 'net-ldap', '~> 0.10'
@ -49,44 +49,45 @@ gem 'goldfinger', '~> 2.1'
 gem 'hiredis', '~> 0.6'
 gem 'redis-namespace', '~> 1.5'
 gem 'htmlentities', '~> 4.3'
-gem 'http', '~> 3.3'
+gem 'http', '~> 3.2'
 gem 'http_accept_language', '~> 2.1'
 gem 'http_parser.rb', '~> 0.6', git: 'https://github.com/tmm1/http_parser.rb', ref: '54b17ba8c7d8d20a16dfc65d1775241833219cf2'
-gem 'httplog', '~> 1.1'
+gem 'httplog', '~> 1.0'
 gem 'idn-ruby', require: 'idn'
 gem 'kaminari', '~> 1.1'
 gem 'link_header', '~> 0.0'
-gem 'mime-types', '~> 3.2', require: 'mime/types/columnar'
+gem 'mime-types', '~> 3.1', require: 'mime/types/columnar'
 gem 'nokogiri', '~> 1.8'
 gem 'nsa', '~> 0.2'
-gem 'oj', '~> 3.7'
+gem 'oj', '~> 3.5'
 gem 'ostatus2', '~> 2.0'
-gem 'ox', '~> 2.10'
+gem 'ox', '~> 2.9'
 gem 'posix-spawn', git: 'https://github.com/rtomayko/posix-spawn', ref: '58465d2e213991f8afb13b984854a49fcdcc980c'
-gem 'pundit', '~> 2.0'
+gem 'pundit', '~> 1.1'
 gem 'premailer-rails'
-gem 'rack-attack', '~> 5.4'
+gem 'rack-attack', '~> 5.2'
 gem 'rack-cors', '~> 1.0', require: 'rack/cors'
 gem 'rails-i18n', '~> 5.1'
 gem 'rails-settings-cached', '~> 0.6'
 gem 'redis', '~> 4.0', require: ['redis', 'redis/connection/hiredis']
 gem 'mario-redis-lock', '~> 1.2', require: 'redis_lock'
 gem 'rqrcode', '~> 0.10'
-gem 'sanitize', '~> 5.0'
+gem 'ruby-progressbar', '~> 1.4'
-gem 'sidekiq', '~> 5.2'
+gem 'sanitize', '~> 4.6'
-gem 'sidekiq-scheduler', '~> 3.0'
+gem 'sidekiq', '~> 5.1'
 gem 'sidekiq-scheduler', '~> 2.2'
 gem 'sidekiq-unique-jobs', '~> 5.0'
 gem 'sidekiq-bulk', '~>0.1.1'
 gem 'simple-navigation', '~> 4.0'
 gem 'simple_form', '~> 4.0'
 gem 'sprockets-rails', '~> 3.2', require: 'sprockets/railtie'
 gem 'stoplight', '~> 2.1.3'
-gem 'strong_migrations', '~> 0.3'
+gem 'strong_migrations', '~> 0.2'
 gem 'tty-command', '~> 0.8', require: false
-gem 'tty-prompt', '~> 0.17', require: false
+gem 'tty-prompt', '~> 0.16', require: false
 gem 'twitter-text', '~> 1.14'
 gem 'tzinfo-data', '~> 1.2018'
-gem 'webpacker', '~> 3.5'
+gem 'webpacker', '~> 3.4'
 gem 'webpush'
 gem 'json-ld', '~> 2.2'
@ -94,45 +95,45 @@ gem 'rdf-normalize', '~> 0.3'
 group :development, :test do
  gem 'fabrication', '~> 2.20'
-  gem 'fuubar', '~> 2.3'
+  gem 'fuubar', '~> 2.2'
  gem 'i18n-tasks', '~> 0.9', require: false
  gem 'pry-byebug', '~> 3.6'
  gem 'pry-rails', '~> 0.3'
-  gem 'rspec-rails', '~> 3.8'
+  gem 'rspec-rails', '~> 3.7'
 end
 group :production, :test do
-  gem 'private_address_check', '~> 0.5'
+  gem 'private_address_check', '~> 0.4.1'
 end
 group :test do
-  gem 'capybara', '~> 3.10'
+  gem 'capybara', '~> 2.18'
  gem 'climate_control', '~> 0.2'
-  gem 'faker', '~> 1.9'
+  gem 'faker', '~> 1.8'
  gem 'microformats', '~> 4.0'
  gem 'rails-controller-testing', '~> 1.0'
  gem 'rspec-sidekiq', '~> 3.0'
  gem 'simplecov', '~> 0.16', require: false
-  gem 'webmock', '~> 3.4'
+  gem 'webmock', '~> 3.3'
-  gem 'parallel_tests', '~> 2.26'
+  gem 'parallel_tests', '~> 2.21'
 end
 group :development do
  gem 'active_record_query_trace', '~> 1.5'
  gem 'annotate', '~> 2.7'
-  gem 'better_errors', '~> 2.5'
+  gem 'better_errors', '~> 2.4'
  gem 'binding_of_caller', '~> 0.7'
  gem 'bullet', '~> 5.7'
  gem 'letter_opener', '~> 1.4'
  gem 'letter_opener_web', '~> 1.3'
  gem 'memory_profiler'
-  gem 'rubocop', '~> 0.60', require: false
+  gem 'rubocop', '~> 0.55', require: false
-  gem 'brakeman', '~> 4.3', require: false
+  gem 'brakeman', '~> 4.2', require: false
  gem 'bundler-audit', '~> 0.6', require: false
  gem 'scss_lint', '~> 0.57', require: false
-  gem 'capistrano', '~> 3.11'
+  gem 'capistrano', '~> 3.10'
-  gem 'capistrano-rails', '~> 1.4'
+  gem 'capistrano-rails', '~> 1.3'
  gem 'capistrano-rbenv', '~> 2.1'
  gem 'capistrano-yarn', '~> 2.0'
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -66,7 +66,7 @@ GEM
      public_suffix (>= 2.0.2, < 4.0)
    airbrussh (1.3.0)
      sshkit (>= 1.6.1, != 1.7.0)
-    annotate (2.7.4)
+    annotate (2.7.3)
      activerecord (>= 3.2, < 6.0)
      rake (>= 10.4, < 13.0)
    arel (9.0.0)
@ -75,42 +75,40 @@ GEM
      encryptor (~> 3.0.0)
    av (0.9.0)
      cocaine (~> 0.5.3)
-    aws-eventstream (1.0.1)
+    aws-partitions (1.80.0)
-    aws-partitions (1.106.0)
+    aws-sdk-core (3.19.0)
    aws-sdk-core (3.35.0)
      aws-eventstream (~> 1.0)
      aws-partitions (~> 1.0)
      aws-sigv4 (~> 1.0)
      jmespath (~> 1.0)
-    aws-sdk-kms (1.11.0)
+    aws-sdk-kms (1.5.0)
-      aws-sdk-core (~> 3, >= 3.26.0)
+      aws-sdk-core (~> 3)
      aws-sigv4 (~> 1.0)
-    aws-sdk-s3 (1.23.0)
+    aws-sdk-s3 (1.9.1)
-      aws-sdk-core (~> 3, >= 3.26.0)
+      aws-sdk-core (~> 3)
      aws-sdk-kms (~> 1)
      aws-sigv4 (~> 1.0)
-    aws-sigv4 (1.0.3)
+    aws-sigv4 (1.0.2)
    bcrypt (3.1.12)
    benchmark-ips (2.7.2)
-    better_errors (2.5.0)
+    better_errors (2.4.0)
      coderay (>= 1.0.0)
      erubi (>= 1.0.0)
      rack (>= 0.9.0)
    binding_of_caller (0.8.0)
      debug_inspector (>= 0.0.1)
-    bootsnap (1.3.2)
+    bootsnap (1.3.0)
      msgpack (~> 1.0)
-    brakeman (4.3.1)
+    brakeman (4.2.1)
    browser (2.5.3)
    builder (3.2.3)
-    bullet (5.7.6)
+    bullet (5.7.5)
      activesupport (>= 3.0.0)
      uniform_notifier (~> 1.11.0)
    bundler-audit (0.6.0)
      bundler (~> 1.2)
      thor (~> 0.18)
    byebug (10.0.2)
-    capistrano (3.11.0)
+    capistrano (3.10.2)
      airbrussh (>= 1.0.0)
      i18n
      rake (>= 10.0.0)
@ -118,22 +116,21 @@ GEM
    capistrano-bundler (1.3.0)
      capistrano (~> 3.1)
      sshkit (~> 1.2)
-    capistrano-rails (1.4.0)
+    capistrano-rails (1.3.1)
      capistrano (~> 3.1)
      capistrano-bundler (~> 1.1)
-    capistrano-rbenv (2.1.4)
+    capistrano-rbenv (2.1.3)
      capistrano (~> 3.1)
      sshkit (~> 1.3)
    capistrano-yarn (2.0.2)
      capistrano (~> 3.0)
-    capybara (3.10.0)
+    capybara (2.18.0)
      addressable
      mini_mime (>= 0.1.3)
-      nokogiri (~> 1.8)
+      nokogiri (>= 1.3.3)
-      rack (>= 1.6.0)
+      rack (>= 1.0.0)
-      rack-test (>= 0.6.3)
+      rack-test (>= 0.5.4)
-      regexp_parser (~> 1.2)
+      xpath (>= 2.0, < 4.0)
      xpath (~> 3.2)
    case_transform (0.2)
      activesupport
    charlock_holmes (0.7.6)
@ -148,15 +145,16 @@ GEM
    cocaine (0.5.8)
      climate_control (>= 0.0.3, < 1.0)
    coderay (1.1.2)
    colorize (0.8.1)
    concurrent-ruby (1.0.5)
-    connection_pool (2.2.2)
+    connection_pool (2.2.1)
    crack (0.4.3)
      safe_yaml (~> 1.0.0)
    crass (1.0.4)
    css_parser (1.6.0)
      addressable
    debug_inspector (0.0.3)
-    derailed_benchmarks (1.3.5)
+    derailed_benchmarks (1.3.4)
      benchmark-ips (~> 2)
      get_process_mem (~> 0)
      heapy (~> 0)
@ -164,7 +162,7 @@ GEM
      rack (>= 1)
      rake (> 10, < 13)
      thor (~> 0.19)
-    devise (4.5.0)
+    devise (4.4.3)
      bcrypt (~> 3.0)
      orm_adapter (~> 0.1)
      railties (>= 4.1.0, < 6.0)
@ -176,19 +174,22 @@ GEM
      devise (~> 4.0)
      railties (< 5.3)
      rotp (~> 2.0)
-    devise_pam_authenticatable2 (9.2.0)
+    devise_pam_authenticatable2 (9.1.1)
      devise (>= 4.0.0)
      rpam2 (~> 4.0)
    diff-lcs (1.3)
    docile (1.3.0)
    domain_name (0.5.20180417)
      unf (>= 0.0.5, < 1.0.0)
-    doorkeeper (5.0.2)
+    doorkeeper (5.0.0)
      railties (>= 4.2)
-    dotenv (2.5.0)
+    dotenv (2.2.2)
-    dotenv-rails (2.5.0)
+    dotenv-rails (2.2.2)
-      dotenv (= 2.5.0)
+      dotenv (= 2.2.2)
      railties (>= 3.2, < 6.0)
    easy_translate (0.5.1)
      thread
      thread_safe
    elasticsearch (6.0.2)
      elasticsearch-api (= 6.0.2)
      elasticsearch-transport (= 6.0.2)
@ -201,37 +202,33 @@ GEM
    encryptor (3.0.0)
    equatable (0.5.0)
    erubi (1.7.1)
-    et-orbi (1.1.6)
+    et-orbi (1.1.0)
      tzinfo
    excon (0.62.0)
    fabrication (2.20.1)
-    faker (1.9.1)
+    faker (1.8.7)
      i18n (>= 0.7)
    faraday (0.15.0)
      multipart-post (>= 1.2, < 3)
    fast_blank (1.0.0)
-    fastimage (2.1.4)
+    fastimage (2.1.1)
-    ffi (1.9.25)
+    ffi (1.9.23)
-    fog-core (2.1.0)
+    fog-core (1.45.0)
      builder
      excon (~> 0.58)
      formatador (~> 0.2)
-      mime-types
+    fog-json (1.0.2)
-    fog-json (1.2.0)
+      fog-core (~> 1.0)
      fog-core
      multi_json (~> 1.10)
-    fog-openstack (0.3.7)
+    fog-openstack (0.1.25)
-      fog-core (>= 1.45, <= 2.1.0)
+      fog-core (~> 1.40)
      fog-json (>= 1.0)
      ipaddress (>= 0.8)
    formatador (0.2.5)
-    fugit (1.1.6)
+    fuubar (2.3.1)
      et-orbi (~> 1.1, >= 1.1.6)
      raabro (~> 1.1)
    fuubar (2.3.2)
      rspec-core (~> 3.0)
      ruby-progressbar (~> 1.4)
-    get_process_mem (0.2.2)
+    get_process_mem (0.2.1)
    globalid (0.4.1)
      activesupport (>= 4.2.0)
    goldfinger (2.1.0)
@ -252,40 +249,39 @@ GEM
      concurrent-ruby (~> 1.0)
    hashdiff (0.3.7)
    hashie (3.5.7)
-    heapy (0.1.4)
+    heapy (0.1.3)
-    highline (2.0.0)
+    highline (1.7.10)
    hiredis (0.6.1)
-    hitimes (1.3.0)
+    hitimes (1.2.6)
    hkdf (0.3.0)
    htmlentities (4.3.4)
-    http (3.3.0)
+    http (3.2.0)
      addressable (~> 2.3)
      http-cookie (~> 1.0)
      http-form_data (~> 2.0)
      http_parser.rb (~> 0.6.0)
    http-cookie (1.0.3)
      domain_name (~> 0.5)
-    http-form_data (2.1.1)
+    http-form_data (2.1.0)
    http_accept_language (2.1.1)
-    httplog (1.1.1)
+    httplog (1.0.2)
      colorize (~> 0.8)
      rack (>= 1.0)
-      rainbow (>= 2.0.0)
+    i18n (1.1.0)
    i18n (1.1.1)
      concurrent-ruby (~> 1.0)
-    i18n-tasks (0.9.28)
+    i18n-tasks (0.9.21)
      activesupport (>= 4.0.2)
      ast (>= 2.1.0)
      easy_translate (>= 0.5.1)
      erubi
-      highline (>= 2.0.0)
+      highline (>= 1.7.3)
      i18n
      parser (>= 2.2.3.0)
      rails-i18n
      rainbow (>= 2.2.2, < 4.0)
      terminal-table (>= 1.5.1)
    idn-ruby (0.1.0)
    ipaddress (0.8.3)
    iso-639 (0.2.8)
    jaro_winkler (1.5.1)
    jmespath (1.4.0)
    json (2.1.0)
    json-ld (2.2.1)
@ -319,7 +315,7 @@ GEM
      activesupport (>= 4)
      railties (>= 4)
      request_store (~> 1.0)
-    loofah (2.2.3)
+    loofah (2.2.2)
      crass (~> 1.0.2)
      nokogiri (>= 1.5.9)
    mail (2.7.0)
@ -330,16 +326,16 @@ GEM
      mimemagic (~> 0.3.2)
    mario-redis-lock (1.2.1)
      redis (>= 3.0.5)
-    memory_profiler (0.9.12)
+    memory_profiler (0.9.10)
    method_source (0.9.0)
    microformats (4.0.7)
      json
      nokogiri
-    mime-types (3.2.2)
+    mime-types (3.1)
      mime-types-data (~> 3.2015)
-    mime-types-data (3.2018.0812)
+    mime-types-data (3.2016.0521)
    mimemagic (0.3.2)
-    mini_mime (1.0.1)
+    mini_mime (1.0.0)
    mini_portile2 (2.3.0)
    minitest (5.11.3)
    msgpack (1.2.4)
@ -349,18 +345,18 @@ GEM
    net-ldap (0.16.1)
    net-scp (1.2.1)
      net-ssh (>= 2.6.5)
-    net-ssh (5.0.2)
+    net-ssh (4.2.0)
    nio4r (2.3.1)
-    nokogiri (1.8.5)
+    nokogiri (1.8.4)
      mini_portile2 (~> 2.3.0)
-    nokogumbo (2.0.0)
+    nokogumbo (1.5.0)
-      nokogiri (~> 1.8, >= 1.8.4)
+      nokogiri
    nsa (0.2.4)
      activesupport (>= 4.2, < 6)
      concurrent-ruby (~> 1.0.0)
      sidekiq (>= 3.5.0)
      statsd-ruby (~> 1.2.0)
-    oj (3.7.0)
+    oj (3.5.1)
    omniauth (1.8.1)
      hashie (>= 3.4.6, < 3.6.0)
      rack (>= 1.6.2, < 3)
@ -368,7 +364,7 @@ GEM
      addressable (~> 2.3)
      nokogiri (~> 1.5)
      omniauth (~> 1.2)
-    omniauth-saml (1.10.1)
+    omniauth-saml (1.10.0)
      omniauth (~> 1.3, >= 1.3.2)
      ruby-saml (~> 1.7)
    orm_adapter (0.5.0)
@ -376,7 +372,7 @@ GEM
      addressable (~> 2.5)
      http (~> 3.0)
      nokogiri (~> 1.8)
-    ox (2.10.0)
+    ox (2.9.2)
    paperclip (6.0.0)
      activemodel (>= 4.2.0)
      activesupport (>= 4.2.0)
@ -387,18 +383,18 @@ GEM
      av (~> 0.9.0)
      paperclip (>= 2.5.2)
    parallel (1.12.1)
-    parallel_tests (2.26.0)
+    parallel_tests (2.21.3)
      parallel
-    parser (2.5.3.0)
+    parser (2.5.1.0)
      ast (~> 2.4.0)
    pastel (0.7.2)
      equatable (~> 0.5.0)
      tty-color (~> 0.4.0)
-    pg (1.1.3)
+    pg (1.0.0)
-    pghero (2.2.0)
+    pghero (2.1.0)
      activerecord
-    pkg-config (1.3.1)
+    pkg-config (1.3.0)
-    powerpack (0.1.2)
+    powerpack (0.1.1)
    premailer (1.11.1)
      addressable
      css_parser (>= 1.6.0)
@ -406,7 +402,7 @@ GEM
    premailer-rails (1.10.2)
      actionmailer (>= 3, < 6)
      premailer (~> 1.7, >= 1.7.9)
-    private_address_check (0.5.0)
+    private_address_check (0.4.1)
    pry (0.11.3)
      coderay (~> 1.1.0)
      method_source (~> 0.9.0)
@ -415,16 +411,15 @@ GEM
      pry (~> 0.10)
    pry-rails (0.3.6)
      pry (>= 0.10.4)
-    public_suffix (3.0.3)
+    public_suffix (3.0.2)
-    puma (3.12.0)
+    puma (3.11.4)
-    pundit (2.0.0)
+    pundit (1.1.0)
      activesupport (>= 3.0.0)
    raabro (1.1.6)
    rack (2.0.5)
-    rack-attack (5.4.1)
+    rack-attack (5.2.0)
-      rack (>= 1.0, < 3)
+      rack
    rack-cors (1.0.2)
-    rack-protection (2.0.4)
+    rack-protection (2.0.1)
      rack
    rack-proxy (0.6.4)
      rack
@ -452,7 +447,7 @@ GEM
      nokogiri (>= 1.6)
    rails-html-sanitizer (1.0.4)
      loofah (~> 2.2, >= 2.2.2)
-    rails-i18n (5.1.2)
+    rails-i18n (5.1.1)
      i18n (>= 0.7, < 2)
      railties (>= 5.0, < 6)
    rails-settings-cached (0.6.6)
@ -473,7 +468,7 @@ GEM
      link_header (~> 0.0, >= 0.0.8)
    rdf-normalize (0.3.3)
      rdf (>= 2.2, < 4.0)
-    redis (4.0.2)
+    redis (4.0.1)
    redis-actionpack (5.0.2)
      actionpack (>= 4.0, < 6)
      redis-rack (>= 1, < 3)
@ -492,7 +487,6 @@ GEM
      redis-store (>= 1.2, < 2)
    redis-store (1.5.0)
      redis (>= 2.2, < 5)
    regexp_parser (1.2.0)
    request_store (1.4.1)
      rack (>= 1.4)
    responders (2.4.0)
@ -502,60 +496,60 @@ GEM
    rpam2 (4.0.2)
    rqrcode (0.10.1)
      chunky_png (~> 1.0)
-    rspec-core (3.8.0)
+    rspec-core (3.7.1)
-      rspec-support (~> 3.8.0)
+      rspec-support (~> 3.7.0)
-    rspec-expectations (3.8.2)
+    rspec-expectations (3.7.0)
      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
+      rspec-support (~> 3.7.0)
-    rspec-mocks (3.8.0)
+    rspec-mocks (3.7.0)
      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
+      rspec-support (~> 3.7.0)
-    rspec-rails (3.8.1)
+    rspec-rails (3.7.2)
      actionpack (>= 3.0)
      activesupport (>= 3.0)
      railties (>= 3.0)
-      rspec-core (~> 3.8.0)
+      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.8.0)
+      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.8.0)
+      rspec-mocks (~> 3.7.0)
-      rspec-support (~> 3.8.0)
+      rspec-support (~> 3.7.0)
    rspec-sidekiq (3.0.3)
      rspec-core (~> 3.0, >= 3.0.0)
      sidekiq (>= 2.4.0)
-    rspec-support (3.8.0)
+    rspec-support (3.7.1)
-    rubocop (0.60.0)
+    rubocop (0.55.0)
      jaro_winkler (~> 1.5.1)
      parallel (~> 1.10)
-      parser (>= 2.5, != 2.5.1.1)
+      parser (>= 2.5)
      powerpack (~> 0.1)
      rainbow (>= 2.2.2, < 4.0)
      ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.4.0)
+      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.10.0)
+    ruby-progressbar (1.9.0)
-    ruby-saml (1.9.0)
+    ruby-saml (1.7.2)
      nokogiri (>= 1.5.10)
-    rufus-scheduler (3.5.2)
+    rufus-scheduler (3.4.2)
-      fugit (~> 1.1, >= 1.1.5)
+      et-orbi (~> 1.0)
    safe_yaml (1.0.4)
-    sanitize (5.0.0)
+    sanitize (4.6.4)
      crass (~> 1.0.2)
-      nokogiri (>= 1.8.0)
+      nokogiri (>= 1.4.4)
-      nokogumbo (~> 2.0)
+      nokogumbo (~> 1.4)
-    sass (3.6.0)
+    sass (3.5.6)
      sass-listen (~> 4.0.0)
    sass-listen (4.0.0)
      rb-fsevent (~> 0.9, >= 0.9.4)
      rb-inotify (~> 0.9, >= 0.9.7)
-    scss_lint (0.57.1)
+    scss_lint (0.57.0)
      rake (>= 0.9, < 13)
-      sass (~> 3.5, >= 3.5.5)
+      sass (~> 3.5.5)
-    sidekiq (5.2.2)
+    sidekiq (5.1.3)
-      connection_pool (~> 2.2, >= 2.2.2)
+      concurrent-ruby (~> 1.0)
      connection_pool (~> 2.2, >= 2.2.0)
      rack-protection (>= 1.5.0)
      redis (>= 3.3.5, < 5)
    sidekiq-bulk (0.1.1)
      activesupport
      sidekiq
-    sidekiq-scheduler (3.0.0)
+    sidekiq-scheduler (2.2.1)
      redis (>= 3, < 5)
      rufus-scheduler (~> 3.2)
      sidekiq (>= 3)
@ -565,9 +559,9 @@ GEM
      thor (~> 0)
    simple-navigation (4.0.5)
      activesupport (>= 2.3.2)
-    simple_form (4.0.1)
+    simple_form (4.0.0)
-      actionpack (>= 5.0)
+      actionpack (> 4)
-      activemodel (>= 5.0)
+      activemodel (> 4)
    simplecov (0.16.1)
      docile (~> 1.1)
      json (>= 1.8, < 3)
@ -580,15 +574,15 @@ GEM
      actionpack (>= 4.0)
      activesupport (>= 4.0)
      sprockets (>= 3.0.0)
-    sshkit (1.17.0)
+    sshkit (1.16.0)
      net-scp (>= 1.1.2)
      net-ssh (>= 2.8.0)
-    stackprof (0.2.12)
+    stackprof (0.2.11)
    statsd-ruby (1.2.1)
    stoplight (2.1.3)
    streamio-ffmpeg (3.0.2)
      multi_json (~> 1.8)
-    strong_migrations (0.3.1)
+    strong_migrations (0.2.2)
      activerecord (>= 3.2.0)
    temple (0.8.0)
    terminal-table (1.8.0)
@ -596,54 +590,55 @@ GEM
    terrapin (0.6.0)
      climate_control (>= 0.0.3, < 1.0)
    thor (0.20.0)
    thread (0.2.2)
    thread_safe (0.3.6)
    tilt (2.0.8)
    timers (4.1.2)
      hitimes
-    tty-color (0.4.3)
+    tty-color (0.4.2)
-    tty-command (0.8.2)
+    tty-command (0.8.0)
      pastel (~> 0.7.0)
-    tty-cursor (0.6.0)
+    tty-cursor (0.5.0)
-    tty-prompt (0.17.1)
+    tty-prompt (0.16.0)
      necromancer (~> 0.4.0)
      pastel (~> 0.7.0)
      timers (~> 4.0)
-      tty-cursor (~> 0.6.0)
+      tty-cursor (~> 0.5.0)
-      tty-reader (~> 0.4.0)
+      tty-reader (~> 0.2.0)
-    tty-reader (0.4.0)
+    tty-reader (0.2.0)
-      tty-cursor (~> 0.6.0)
+      tty-cursor (~> 0.5.0)
      tty-screen (~> 0.6.4)
      wisper (~> 2.0.0)
-    tty-screen (0.6.5)
+    tty-screen (0.6.4)
    twitter-text (1.14.7)
      unf (~> 0.1.0)
    tzinfo (1.2.5)
      thread_safe (~> 0.1)
-    tzinfo-data (1.2018.7)
+    tzinfo-data (1.2018.4)
      tzinfo (>= 1.0.0)
    unf (0.1.4)
      unf_ext
    unf_ext (0.0.7.5)
-    unicode-display_width (1.4.0)
+    unicode-display_width (1.3.2)
    uniform_notifier (1.11.0)
    warden (1.2.7)
      rack (>= 1.0)
-    webmock (3.4.2)
+    webmock (3.3.0)
      addressable (>= 2.3.6)
      crack (>= 0.3.2)
      hashdiff
-    webpacker (3.5.5)
+    webpacker (3.4.3)
      activesupport (>= 4.2)
      rack-proxy (>= 0.6.1)
      railties (>= 4.2)
-    webpush (0.3.4)
+    webpush (0.3.3)
      hkdf (~> 0.2)
      jwt (~> 2.0)
    websocket-driver (0.7.0)
      websocket-extensions (>= 0.1.0)
    websocket-extensions (0.1.3)
    wisper (2.0.0)
-    xpath (3.2.0)
+    xpath (3.0.0)
      nokogiri (~> 1.8)
 PLATFORMS
@ -654,44 +649,44 @@ DEPENDENCIES
  active_record_query_trace (~> 1.5)
  addressable (~> 2.5)
  annotate (~> 2.7)
-  aws-sdk-s3 (~> 1.23)
+  aws-sdk-s3 (~> 1.9)
-  better_errors (~> 2.5)
+  better_errors (~> 2.4)
  binding_of_caller (~> 0.7)
  bootsnap (~> 1.3)
-  brakeman (~> 4.3)
+  brakeman (~> 4.2)
  browser
  bullet (~> 5.7)
  bundler-audit (~> 0.6)
-  capistrano (~> 3.11)
+  capistrano (~> 3.10)
-  capistrano-rails (~> 1.4)
+  capistrano-rails (~> 1.3)
  capistrano-rbenv (~> 2.1)
  capistrano-yarn (~> 2.0)
-  capybara (~> 3.10)
+  capybara (~> 2.18)
  charlock_holmes (~> 0.7.6)
  chewy (~> 5.0)
  cld3 (~> 3.2.0)
  climate_control (~> 0.2)
  derailed_benchmarks
-  devise (~> 4.5)
+  devise (~> 4.4)
  devise-two-factor (~> 3.0)
-  devise_pam_authenticatable2 (~> 9.2)
+  devise_pam_authenticatable2 (~> 9.1)
  doorkeeper (~> 5.0)
-  dotenv-rails (~> 2.5)
+  dotenv-rails (~> 2.2, < 2.3)
  fabrication (~> 2.20)
-  faker (~> 1.9)
+  faker (~> 1.8)
  fast_blank (~> 1.0)
  fastimage
-  fog-core (<= 2.1.0)
+  fog-core (~> 1.45)
-  fog-openstack (~> 0.3)
+  fog-openstack (~> 0.1)
-  fuubar (~> 2.3)
+  fuubar (~> 2.2)
  goldfinger (~> 2.1)
  hamlit-rails (~> 0.2)
  hiredis (~> 0.6)
  htmlentities (~> 4.3)
-  http (~> 3.3)
+  http (~> 3.2)
  http_accept_language (~> 2.1)
  http_parser.rb (~> 0.6)!
-  httplog (~> 1.1)
+  httplog (~> 1.0)
  i18n-tasks (~> 0.9)
  idn-ruby
  iso-639
@ -705,30 +700,30 @@ DEPENDENCIES
  mario-redis-lock (~> 1.2)
  memory_profiler
  microformats (~> 4.0)
-  mime-types (~> 3.2)
+  mime-types (~> 3.1)
  net-ldap (~> 0.10)
  nokogiri (~> 1.8)
  nsa (~> 0.2)
-  oj (~> 3.7)
+  oj (~> 3.5)
  omniauth (~> 1.2)
  omniauth-cas (~> 1.1)
  omniauth-saml (~> 1.10)
  ostatus2 (~> 2.0)
-  ox (~> 2.10)
+  ox (~> 2.9)
  paperclip (~> 6.0)
  paperclip-av-transcoder (~> 0.6)
-  parallel_tests (~> 2.26)
+  parallel_tests (~> 2.21)
-  pg (~> 1.1)
+  pg (~> 1.0)
-  pghero (~> 2.2)
+  pghero (~> 2.1)
  pkg-config (~> 1.3)
  posix-spawn!
  premailer-rails
-  private_address_check (~> 0.5)
+  private_address_check (~> 0.4.1)
  pry-byebug (~> 3.6)
  pry-rails (~> 0.3)
-  puma (~> 3.12)
+  puma (~> 3.11)
-  pundit (~> 2.0)
+  pundit (~> 1.1)
-  rack-attack (~> 5.4)
+  rack-attack (~> 5.2)
  rack-cors (~> 1.0)
  rails (~> 5.2.1)
  rails-controller-testing (~> 1.0)
@ -739,14 +734,15 @@ DEPENDENCIES
  redis-namespace (~> 1.5)
  redis-rails (~> 5.0)
  rqrcode (~> 0.10)
-  rspec-rails (~> 3.8)
+  rspec-rails (~> 3.7)
  rspec-sidekiq (~> 3.0)
-  rubocop (~> 0.60)
+  rubocop (~> 0.55)
-  sanitize (~> 5.0)
+  ruby-progressbar (~> 1.4)
  sanitize (~> 4.6)
  scss_lint (~> 0.57)
-  sidekiq (~> 5.2)
+  sidekiq (~> 5.1)
  sidekiq-bulk (~> 0.1.1)
-  sidekiq-scheduler (~> 3.0)
+  sidekiq-scheduler (~> 2.2)
  sidekiq-unique-jobs (~> 5.0)
  simple-navigation (~> 4.0)
  simple_form (~> 4.0)
@ -755,18 +751,18 @@ DEPENDENCIES
  stackprof
  stoplight (~> 2.1.3)
  streamio-ffmpeg (~> 3.0)
-  strong_migrations (~> 0.3)
+  strong_migrations (~> 0.2)
  thor (~> 0.20)
  tty-command (~> 0.8)
-  tty-prompt (~> 0.17)
+  tty-prompt (~> 0.16)
  twitter-text (~> 1.14)
  tzinfo-data (~> 1.2018)
-  webmock (~> 3.4)
+  webmock (~> 3.3)
-  webpacker (~> 3.5)
+  webpacker (~> 3.4)
  webpush
 RUBY VERSION
-   ruby 2.5.3p105
+   ruby 2.5.0p0
 BUNDLED WITH
-   1.16.6
+   1.16.3
--- a/README.md
+++ b/README.md
@ -1,95 +1,98 @@
 ![Mastodon](https://i.imgur.com/NhZc40l.png)
 ========
 [![GitHub release](https://img.shields.io/github/release/tootsuite/mastodon.svg)][releases]
 [![Build Status](https://img.shields.io/circleci/project/github/tootsuite/mastodon.svg)][circleci]
 [![Code Climate](https://img.shields.io/codeclimate/maintainability/tootsuite/mastodon.svg)][code_climate]
 [![Translation status](https://weblate.joinmastodon.org/widgets/mastodon/-/svg-badge.svg)][weblate]
 [![Docker Pulls](https://img.shields.io/docker/pulls/tootsuite/mastodon.svg)][docker]
 [releases]: https://github.com/tootsuite/mastodon/releases
 [circleci]: https://circleci.com/gh/tootsuite/mastodon
 [code_climate]: https://codeclimate.com/github/tootsuite/mastodon
 [weblate]: https://weblate.joinmastodon.org/engage/mastodon/
 [docker]: https://hub.docker.com/r/tootsuite/mastodon/
-Mastodon is a **free, open-source social network server** based on ActivityPub. Follow friends and discover new ones. Publish anything you want: links, pictures, text, video. All servers of Mastodon are interoperable as a federated network, i.e. users on one server can seamlessly communicate with users from another one. This includes non-Mastodon software that also implements ActivityPub!
+Mastodon is a **free, open-source social network server** based on **open web protocols** like ActivityPub and OStatus. The social focus of the project is a viable decentralized alternative to commercial social media silos that returns the control of the content distribution channels to the people. The technical focus of the project is a good user interface, a clean REST API for 3rd party apps and robust anti-abuse tools.
-Click below to **learn more** in a video:
+Click on the screenshot below to watch a demo of the UI:
-[![Screenshot](https://blog.joinmastodon.org/2018/06/why-activitypub-is-the-future/ezgif-2-60f1b00403.gif)][youtube_demo]
+[![Screenshot](https://i.imgur.com/qrNOiSp.png)][youtube_demo]
 [youtube_demo]: https://www.youtube.com/watch?v=IPSbNdBmWKE
-## Navigation 
+**Ruby on Rails** is used for the back-end, while **React.js** and Redux are used for the dynamic front-end. A static front-end for public resources (profiles and statuses) is also provided.
- [Project homepage 🐘](https://joinmastodon.org)
+If you would like, you can [support the development of this project on Patreon][patreon].
 - [Support the development via Patreon][patreon]
 - [View sponsors](https://joinmastodon.org/sponsors)
 - [Blog](https://blog.joinmastodon.org)
 - [Documentation](https://docs.joinmastodon.org)
 - [Browse Mastodon servers](https://joinmastodon.org/#getting-started)
 - [Browse Mastodon apps](https://joinmastodon.org/apps)
 [patreon]: https://www.patreon.com/mastodon
-## Features
+---
-<img src="https://docs.joinmastodon.org/elephant.svg" align="right" width="30%" />
+## Resources
 - [Quick start guide](https://blog.joinmastodon.org/2018/08/mastodon-quick-start-guide/)
 - [Find Twitter friends on Mastodon](https://bridge.joinmastodon.org)
 - [API overview](https://github.com/tootsuite/documentation/blob/master/Using-the-API/API.md)
 - [Documentation](https://github.com/tootsuite/documentation)
 - [List of servers](https://joinmastodon.org/#getting-started)
 - [List of apps](https://joinmastodon.org/apps)
 - [List of sponsors](https://joinmastodon.org/sponsors)
 ## Features
 **No vendor lock-in: Fully interoperable with any conforming platform**
-It doesn't have to be Mastodon, whatever implements ActivityPub is part of the social network! [Learn more](https://blog.joinmastodon.org/2018/06/why-activitypub-is-the-future/)
+It doesn't have to be Mastodon, whatever implements ActivityPub or OStatus is part of the social network!
-**Real-time, chronological timeline updates**
+**Real-time timeline updates**
 See the updates of people you're following appear in real-time in the UI via WebSockets. There's a firehose view as well!
 **Federated thread resolving**
 If someone you follow replies to a user unknown to the server, the server fetches the full thread so you can view it without leaving the UI
 **Media attachments like images and short videos**
 Upload and view images and WebM/MP4 videos attached to the updates. Videos with no audio track are treated like GIFs; normal videos are looped - like vines!
 **Safety and moderation tools**
 Private posts, locked accounts, phrase filtering, muting, blocking and all sorts of other features, along with a reporting and moderation system. [Learn more](https://blog.joinmastodon.org/2018/07/cage-the-mastodon/)
 **OAuth2 and a straightforward REST API**
-Mastodon acts as an OAuth2 provider so 3rd party apps can use the REST and Streaming APIs, resulting in a rich app ecosystem with a lot of choice!
+Mastodon acts as an OAuth2 provider so 3rd party apps can use the API
 **Fast response times**
 Mastodon tries to be as fast and responsive as possible, so all long-running tasks are delegated to background processing
 **Deployable via Docker**
 You don't need to mess with dependencies and configuration if you want to try Mastodon, if you have Docker and Docker Compose the deployment is extremely easy
 ---
 ## Development
 Please follow the [development guide](https://github.com/tootsuite/documentation/blob/master/Running-Mastodon/Development-guide.md) from the documentation repository.
 ## Deployment
-**Tech stack:**
+There are guides in the documentation repository for [deploying on various platforms](https://github.com/tootsuite/documentation#running-mastodon).
 - **Ruby on Rails** powers the REST API and other web pages
 - **React.js** and Redux are used for the dynamic parts of the interface
 - **Node.js** powers the streaming API
 **Requirements:**
 - **PostgreSQL** 9.5+
 - **Redis**
 - **Ruby** 2.4+
 - **Node.js** 8+
 The repository includes deployment configurations for **Docker and docker-compose**, but also a few specific platforms like **Heroku**, **Scalingo**, and **Nanobox**. The [**stand-alone** installation guide](https://docs.joinmastodon.org/administration/installation/) is available in the documentation.
 A **Vagrant** configuration is included for development purposes.
 ## Contributing
-Mastodon is **free, open source software** licensed under **AGPLv3**.
+You can open issues for bugs you've found or features you think are missing. You can also submit pull requests to this repository. [Here are the guidelines for code contributions](CONTRIBUTING.md)
 You can open issues for bugs you've found or features you think are missing. You can also submit pull requests to this repository, or submit translations using Weblate. To get started, take a look at [CONTRIBUTING.md](CONTRIBUTING.md)
 **IRC channel**: #mastodon on irc.freenode.net
 ## License
-Copyright (C) 2016-2018 Eugen Rochko & other Mastodon contributors (see [AUTHORS.md](AUTHORS.md))
+Copyright (C) 2016-2018 Eugen Rochko & other Mastodon contributors (see AUTHORS.md)
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
 This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.
 ---
 ## Extra credits
 The elephant friend illustrations are created by [Dopatwo](https://mastodon.social/@dopatwo)
--- a/14
+++ b/14
@ -85,9 +85,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
  config.vm.provider :virtualbox do |vb|
    vb.name = "mastodon"
    vb.customize ["modifyvm", :id, "--memory", "2048"]
    # Increase the number of CPUs. Uncomment and adjust to
    # increase performance
    # vb.customize ["modifyvm", :id, "--cpus", "3"]
    # Disable VirtualBox DNS proxy to skip long-delay IPv6 resolutions.
    # https://github.com/mitchellh/vagrant/issues/1172
@ -100,22 +97,19 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
  end
  config.vm.hostname = "mastodon.dev"
  # This uses the vagrant-hostsupdater plugin, and lets you
-  # access the development site at http://mastodon.local.
+  # access the development site at http://mastodon.dev.
  # If you change it, also change it in .env.vagrant before provisioning
  # the vagrant server to update the development build.
  #
  # To install:
  #   $ vagrant plugin install vagrant-hostsupdater
  config.vm.hostname = "mastodon.local"
  if defined?(VagrantPlugins::HostsUpdater)
    config.vm.network :private_network, ip: "192.168.42.42", nictype: "virtio"
    config.hostsupdater.remove_on_suspend = false
  end
  if config.vm.networks.any? { |type, options| type == :private_network }
-    config.vm.synced_folder ".", "/vagrant", type: "nfs", mount_options: ['rw', 'vers=3', 'tcp', 'actimeo=1']
+    config.vm.synced_folder ".", "/vagrant", type: "nfs", mount_options: ['rw', 'vers=3', 'tcp']
  else
    config.vm.synced_folder ".", "/vagrant"
  end
--- a/app/controllers/activitypub/inboxes_controller.rb
+++ b/app/controllers/activitypub/inboxes_controller.rb
@ -36,6 +36,6 @@ class ActivityPub::InboxesController < Api::BaseController
  end
  def process_payload
-    ActivityPub::ProcessingWorker.perform_async(signed_request_account.id, body.force_encoding('UTF-8'), @account&.id)
+    ActivityPub::ProcessingWorker.perform_async(signed_request_account.id, body.force_encoding('UTF-8'))
  end
 end
--- a/app/controllers/admin/accounts_controller.rb
+++ b/app/controllers/admin/accounts_controller.rb
@ -95,7 +95,7 @@ module Admin
        :remote,
        :by_domain,
        :silenced,
-        :alphabetic,
+        :recent,
        :suspended,
        :username,
        :display_name,
--- a/app/controllers/admin/base_controller.rb
+++ b/app/controllers/admin/base_controller.rb
@ -5,15 +5,8 @@ module Admin
    include Authorization
    include AccountableConcern
    layout 'admin'
    before_action :require_staff!
    before_action :set_body_classes
-    private
+    layout 'admin'
    def set_body_classes
      @body_classes = 'admin'
    end
  end
 end
--- a/app/controllers/admin/domain_blocks_controller.rb
+++ b/app/controllers/admin/domain_blocks_controller.rb
@ -46,7 +46,7 @@ module Admin
    end
    def resource_params
-      params.require(:domain_block).permit(:domain, :severity, :reject_media, :reject_reports, :retroactive)
+      params.require(:domain_block).permit(:domain, :severity, :reject_media, :retroactive)
    end
    def retroactive_unblock?
--- a/app/controllers/admin/reports_controller.rb
+++ b/app/controllers/admin/reports_controller.rb
@ -44,14 +44,6 @@ module Admin
      when 'resolve'
        @report.resolve!(current_account)
        log_action :resolve, @report
      when 'disable'
        @report.resolve!(current_account)
        @report.target_account.user.disable!
        log_action :resolve, @report
        log_action :disable, @report.target_account.user
        resolve_all_target_account_reports
      when 'silence'
        @report.resolve!(current_account)
        @report.target_account.update!(silenced: true)
@ -63,7 +55,6 @@ module Admin
      else
        raise ActiveRecord::RecordNotFound
      end
      @report.reload
    end
--- a/app/controllers/admin/settings_controller.rb
+++ b/app/controllers/admin/settings_controller.rb
@ -19,7 +19,6 @@ module Admin
      theme
      thumbnail
      hero
      mascot
      min_invite_role
      activity_api_enabled
      peers_api_enabled
@ -42,7 +41,6 @@ module Admin
    UPLOAD_SETTINGS = %w(
      thumbnail
      hero
      mascot
    ).freeze
    def edit
--- a/app/controllers/api/base_controller.rb
+++ b/app/controllers/api/base_controller.rb
@ -53,8 +53,8 @@ class Api::BaseController < ApplicationController
    [params[:limit].to_i.abs, default_limit * 2].min
  end
-  def params_slice(*keys)
+  def truthy_param?(key)
-    params.slice(*keys).permit(*keys)
+    ActiveModel::Type::Boolean.new.cast(params[key])
  end
  def current_resource_owner
--- a/app/controllers/api/v1/accounts/statuses_controller.rb
+++ b/app/controllers/api/v1/accounts/statuses_controller.rb
@ -28,9 +28,10 @@ class Api::V1::Accounts::StatusesController < Api::BaseController
  def account_statuses
    statuses = truthy_param?(:pinned) ? pinned_scope : permitted_account_statuses
-    statuses = statuses.paginate_by_id(
+    statuses = statuses.paginate_by_max_id(
      limit_param(DEFAULT_STATUSES_LIMIT),
-      params_slice(:max_id, :since_id, :min_id)
+      params[:max_id],
      params[:since_id]
    )
    statuses.merge!(only_media_scope) if truthy_param?(:only_media)
@ -81,7 +82,7 @@ class Api::V1::Accounts::StatusesController < Api::BaseController
  def prev_path
    unless @statuses.empty?
-      api_v1_account_statuses_url pagination_params(min_id: pagination_since_id)
+      api_v1_account_statuses_url pagination_params(since_id: pagination_since_id)
    end
  end
--- a/app/controllers/api/v1/conversations_controller.rb
+++ b/app/controllers/api/v1/conversations_controller.rb
@ -1,71 +0,0 @@
 # frozen_string_literal: true
 class Api::V1::ConversationsController < Api::BaseController
  LIMIT = 20
  before_action -> { doorkeeper_authorize! :read, :'read:statuses' }, only: :index
  before_action -> { doorkeeper_authorize! :write, :'write:conversations' }, except: :index
  before_action :require_user!
  before_action :set_conversation, except: :index
  after_action :insert_pagination_headers, only: :index
  respond_to :json
  def index
    @conversations = paginated_conversations
    render json: @conversations, each_serializer: REST::ConversationSerializer
  end
  def read
    @conversation.update!(unread: false)
    render json: @conversation, serializer: REST::ConversationSerializer
  end
  def destroy
    @conversation.destroy!
    render_empty
  end
  private
  def set_conversation
    @conversation = AccountConversation.where(account: current_account).find(params[:id])
  end
  def paginated_conversations
    AccountConversation.where(account: current_account)
                       .paginate_by_id(limit_param(LIMIT), params_slice(:max_id, :since_id, :min_id))
  end
  def insert_pagination_headers
    set_pagination_headers(next_path, prev_path)
  end
  def next_path
    if records_continue?
      api_v1_conversations_url pagination_params(max_id: pagination_max_id)
    end
  end
  def prev_path
    unless @conversations.empty?
      api_v1_conversations_url pagination_params(min_id: pagination_since_id)
    end
  end
  def pagination_max_id
    @conversations.last.last_status_id
  end
  def pagination_since_id
    @conversations.first.last_status_id
  end
  def records_continue?
    @conversations.size == limit_param(LIMIT)
  end
  def pagination_params(core_params)
    params.slice(:limit).permit(:limit).merge(core_params)
  end
 end
--- a/app/controllers/api/v1/favourites_controller.rb
+++ b/app/controllers/api/v1/favourites_controller.rb
@ -26,9 +26,10 @@ class Api::V1::FavouritesController < Api::BaseController
  end
  def results
-    @_results ||= account_favourites.paginate_by_id(
+    @_results ||= account_favourites.paginate_by_max_id(
      limit_param(DEFAULT_STATUSES_LIMIT),
-      params_slice(:max_id, :since_id, :min_id)
+      params[:max_id],
      params[:since_id]
    )
  end
@ -48,7 +49,7 @@ class Api::V1::FavouritesController < Api::BaseController
  def prev_path
    unless results.empty?
-      api_v1_favourites_url pagination_params(min_id: pagination_since_id)
+      api_v1_favourites_url pagination_params(since_id: pagination_since_id)
    end
  end
--- a/app/controllers/api/v1/instances_controller.rb
+++ b/app/controllers/api/v1/instances_controller.rb
@ -4,8 +4,6 @@ class Api::V1::InstancesController < Api::BaseController
  respond_to :json
  def show
-    render_cached_json('api:v1:instances', expires_in: 5.minutes) do
+    render json: {}, serializer: REST::InstanceSerializer
      ActiveModelSerializers::SerializableResource.new({}, serializer: REST::InstanceSerializer)
    end
  end
 end
--- a/app/controllers/api/v1/notifications_controller.rb
+++ b/app/controllers/api/v1/notifications_controller.rb
@ -37,9 +37,10 @@ class Api::V1::NotificationsController < Api::BaseController
  end
  def paginated_notifications
-    browserable_account_notifications.paginate_by_id(
+    browserable_account_notifications.paginate_by_max_id(
      limit_param(DEFAULT_NOTIFICATIONS_LIMIT),
-      params_slice(:max_id, :since_id, :min_id)
+      params[:max_id],
      params[:since_id]
    )
  end
@ -63,7 +64,7 @@ class Api::V1::NotificationsController < Api::BaseController
  def prev_path
    unless @notifications.empty?
-      api_v1_notifications_url pagination_params(min_id: pagination_since_id)
+      api_v1_notifications_url pagination_params(since_id: pagination_since_id)
    end
  end
--- a/app/controllers/api/v1/reports_controller.rb
+++ b/app/controllers/api/v1/reports_controller.rb
@ -1,11 +1,17 @@
 # frozen_string_literal: true
 class Api::V1::ReportsController < Api::BaseController
  before_action -> { doorkeeper_authorize! :read, :'read:reports' }, except: [:create]
  before_action -> { doorkeeper_authorize! :write, :'write:reports' }, only: [:create]
  before_action :require_user!
  respond_to :json
  def index
    @reports = current_account.reports
    render json: @reports, each_serializer: REST::ReportSerializer
  end
  def create
    @report = ReportService.new.call(
      current_account,
@ -21,7 +27,7 @@ class Api::V1::ReportsController < Api::BaseController
  private
  def reported_status_ids
-    reported_account.statuses.find(status_ids).pluck(:id)
+    Status.find(status_ids).pluck(:id)
  end
  def status_ids
--- a/app/controllers/api/v1/timelines/home_controller.rb
+++ b/app/controllers/api/v1/timelines/home_controller.rb
@ -30,8 +30,7 @@ class Api::V1::Timelines::HomeController < Api::BaseController
    account_home_feed.get(
      limit_param(DEFAULT_STATUSES_LIMIT),
      params[:max_id],
-      params[:since_id],
+      params[:since_id]
      params[:min_id]
    )
  end
@ -52,7 +51,7 @@ class Api::V1::Timelines::HomeController < Api::BaseController
  end
  def prev_path
-    api_v1_timelines_home_url pagination_params(min_id: pagination_since_id)
+    api_v1_timelines_home_url pagination_params(since_id: pagination_since_id)
  end
  def pagination_max_id
--- a/app/controllers/api/v1/timelines/list_controller.rb
+++ b/app/controllers/api/v1/timelines/list_controller.rb
@ -32,8 +32,7 @@ class Api::V1::Timelines::ListController < Api::BaseController
    list_feed.get(
      limit_param(DEFAULT_STATUSES_LIMIT),
      params[:max_id],
-      params[:since_id],
+      params[:since_id]
      params[:min_id]
    )
  end
@ -54,7 +53,7 @@ class Api::V1::Timelines::ListController < Api::BaseController
  end
  def prev_path
-    api_v1_timelines_list_url params[:id], pagination_params(min_id: pagination_since_id)
+    api_v1_timelines_list_url params[:id], pagination_params(since_id: pagination_since_id)
  end
  def pagination_max_id
--- a/app/controllers/api/v1/timelines/public_controller.rb
+++ b/app/controllers/api/v1/timelines/public_controller.rb
@ -21,9 +21,10 @@ class Api::V1::Timelines::PublicController < Api::BaseController
  end
  def public_statuses
-    statuses = public_timeline_statuses.paginate_by_id(
+    statuses = public_timeline_statuses.paginate_by_max_id(
      limit_param(DEFAULT_STATUSES_LIMIT),
-      params_slice(:max_id, :since_id, :min_id)
+      params[:max_id],
      params[:since_id]
    )
    if truthy_param?(:only_media)
@ -52,7 +53,7 @@ class Api::V1::Timelines::PublicController < Api::BaseController
  end
  def prev_path
-    api_v1_timelines_public_url pagination_params(min_id: pagination_since_id)
+    api_v1_timelines_public_url pagination_params(since_id: pagination_since_id)
  end
  def pagination_max_id
--- a/app/controllers/api/v1/timelines/tag_controller.rb
+++ b/app/controllers/api/v1/timelines/tag_controller.rb
@ -29,9 +29,10 @@ class Api::V1::Timelines::TagController < Api::BaseController
    if @tag.nil?
      []
    else
-      statuses = tag_timeline_statuses.paginate_by_id(
+      statuses = tag_timeline_statuses.paginate_by_max_id(
        limit_param(DEFAULT_STATUSES_LIMIT),
-        params_slice(:max_id, :since_id, :min_id)
+        params[:max_id],
        params[:since_id]
      )
      if truthy_param?(:only_media)
@ -61,7 +62,7 @@ class Api::V1::Timelines::TagController < Api::BaseController
  end
  def prev_path
-    api_v1_timelines_tag_url params[:id], pagination_params(min_id: pagination_since_id)
+    api_v1_timelines_tag_url params[:id], pagination_params(since_id: pagination_since_id)
  end
  def pagination_max_id
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@ -58,10 +58,6 @@ class ApplicationController < ActionController::Base
  protected
  def truthy_param?(key)
    ActiveModel::Type::Boolean.new.cast(params[key])
  end
  def forbidden
    respond_with_error(403)
  end
@ -126,7 +122,6 @@ class ApplicationController < ActionController::Base
  def respond_with_error(code)
    respond_to do |format|
      format.any  { head code }
      format.html do
        set_locale
        render "errors/#{code}", layout: 'error', status: code
--- a/app/controllers/auth/registrations_controller.rb
+++ b/app/controllers/auth/registrations_controller.rb
@ -8,7 +8,7 @@ class Auth::RegistrationsController < Devise::RegistrationsController
  before_action :configure_sign_up_params, only: [:create]
  before_action :set_sessions, only: [:edit, :update]
  before_action :set_instance_presenter, only: [:new, :create, :update]
-  before_action :set_body_classes, only: [:new, :create, :edit, :update]
+  before_action :set_body_classes, only: [:new, :create]
  def destroy
    not_found
@ -81,7 +81,7 @@ class Auth::RegistrationsController < Devise::RegistrationsController
  end
  def set_body_classes
-    @body_classes = %w(edit update).include?(action_name) ? 'admin' : 'lighter'
+    @body_classes = 'lighter'
  end
  def set_invite
--- a/app/controllers/auth/sessions_controller.rb
+++ b/app/controllers/auth/sessions_controller.rb
@ -27,10 +27,8 @@ class Auth::SessionsController < Devise::SessionsController
  end
  def destroy
    tmp_stored_location = stored_location_for(:user)
    super
    flash.delete(:notice)
    store_location_for(:user, tmp_stored_location) if continue_after?
  end
  protected
@ -123,8 +121,4 @@ class Auth::SessionsController < Devise::SessionsController
    end
    paths
  end
  def continue_after?
    truthy_param?(:continue)
  end
 end
--- a/app/controllers/concerns/localized.rb
+++ b/app/controllers/concerns/localized.rb
@ -20,12 +20,7 @@ module Localized
    if ENV['DEFAULT_LOCALE'].present?
      I18n.default_locale
    else
-      case request_locale
+      request_locale || I18n.default_locale
      when /en\b/, nil
        I18n.default_locale
      else
        request_locale
      end
    end
  end
--- a/app/controllers/concerns/signature_verification.rb
+++ b/app/controllers/concerns/signature_verification.rb
@ -22,12 +22,6 @@ module SignatureVerification
      return
    end
    if request.headers['Date'].present? && !matches_time_window?
      @signature_verification_failure_reason = 'Signed request date outside acceptable time window'
      @signed_request_account = nil
      return
    end
    raw_signature    = request.headers['Signature']
    signature_params = {}
@ -82,7 +76,7 @@ module SignatureVerification
  def build_signed_string(signed_headers)
    signed_headers = 'date' if signed_headers.blank?
-    signed_headers.downcase.split(' ').map do |signed_header|
+    signed_headers.split(' ').map do |signed_header|
      if signed_header == Request::REQUEST_TARGET
        "#{Request::REQUEST_TARGET}: #{request.method.downcase} #{request.path}"
      elsif signed_header == 'digest'
@ -95,12 +89,12 @@ module SignatureVerification
  def matches_time_window?
    begin
-      time_sent = Time.httpdate(request.headers['Date'])
+      time_sent = DateTime.httpdate(request.headers['Date'])
    rescue ArgumentError
      return false
    end
-    (Time.now.utc - time_sent).abs <= 12.hours
+    (Time.now.utc - time_sent).abs <= 30
  end
  def body_digest
--- a/app/controllers/filters_controller.rb
+++ b/app/controllers/filters_controller.rb
@ -7,7 +7,6 @@ class FiltersController < ApplicationController
  before_action :set_filters, only: :index
  before_action :set_filter, only: [:edit, :update, :destroy]
  before_action :set_body_classes
  def index
    @filters = current_account.custom_filters
@ -55,8 +54,4 @@ class FiltersController < ApplicationController
  def resource_params
    params.require(:custom_filter).permit(:phrase, :expires_in, :irreversible, :whole_word, context: [])
  end
  def set_body_classes
    @body_classes = 'admin'
  end
 end
--- a/app/controllers/invites_controller.rb
+++ b/app/controllers/invites_controller.rb
@ -6,7 +6,6 @@ class InvitesController < ApplicationController
  layout 'admin'
  before_action :authenticate_user!
  before_action :set_body_classes
  def index
    authorize :invite, :create?
@ -45,8 +44,4 @@ class InvitesController < ApplicationController
  def resource_params
    params.require(:invite).permit(:max_uses, :expires_in, :autofollow)
  end
  def set_body_classes
    @body_classes = 'admin'
  end
 end
--- a/app/controllers/oauth/authorizations_controller.rb
+++ b/app/controllers/oauth/authorizations_controller.rb
@ -13,18 +13,4 @@ class Oauth::AuthorizationsController < Doorkeeper::AuthorizationsController
  def store_current_location
    store_location_for(:user, request.url)
  end
  def render_success
    if skip_authorization? || (matching_token? && !truthy_param?('force_login'))
      redirect_or_render authorize_response
    elsif Doorkeeper.configuration.api_only
      render json: pre_auth
    else
      render :new
    end
  end
  def truthy_param?(key)
    ActiveModel::Type::Boolean.new.cast(params[key])
  end
 end
--- a/app/controllers/settings/applications_controller.rb
+++ b/app/controllers/settings/applications_controller.rb
@ -6,7 +6,6 @@ class Settings::ApplicationsController < ApplicationController
  before_action :authenticate_user!
  before_action :set_application, only: [:show, :update, :destroy, :regenerate]
  before_action :prepare_scopes, only: [:create, :update]
  before_action :set_body_classes
  def index
    @applications = current_user.applications.order(id: :desc).page(params[:page])
@ -70,8 +69,4 @@ class Settings::ApplicationsController < ApplicationController
    scopes = params.fetch(:doorkeeper_application, {}).fetch(:scopes, nil)
    params[:doorkeeper_application][:scopes] = scopes.join(' ') if scopes.is_a? Array
  end
  def set_body_classes
    @body_classes = 'admin'
  end
 end
--- a/app/controllers/settings/deletes_controller.rb
+++ b/app/controllers/settings/deletes_controller.rb
@ -5,7 +5,6 @@ class Settings::DeletesController < ApplicationController
  before_action :check_enabled_deletion
  before_action :authenticate_user!
  before_action :set_body_classes
  def show
    @confirmation = Form::DeleteConfirmation.new
@ -30,8 +29,4 @@ class Settings::DeletesController < ApplicationController
  def delete_params
    params.require(:form_delete_confirmation).permit(:password)
  end
  def set_body_classes
    @body_classes = 'admin'
  end
 end
--- a/app/controllers/settings/exports_controller.rb
+++ b/app/controllers/settings/exports_controller.rb
@ -6,7 +6,6 @@ class Settings::ExportsController < ApplicationController
  layout 'admin'
  before_action :authenticate_user!
  before_action :set_body_classes
  def show
    @export  = Export.new(current_account)
@ -21,10 +20,4 @@ class Settings::ExportsController < ApplicationController
    redirect_to settings_export_path
  end
  private
  def set_body_classes
    @body_classes = 'admin'
  end
 end
--- a/app/controllers/settings/follower_domains_controller.rb
+++ b/app/controllers/settings/follower_domains_controller.rb
@ -4,7 +4,6 @@ class Settings::FollowerDomainsController < ApplicationController
  layout 'admin'
  before_action :authenticate_user!
  before_action :set_body_classes
  def show
    @account = current_account
@ -26,8 +25,4 @@ class Settings::FollowerDomainsController < ApplicationController
  def bulk_params
    params.permit(select: [])
  end
  def set_body_classes
    @body_classes = 'admin'
  end
 end
--- a/app/controllers/settings/imports_controller.rb
+++ b/app/controllers/settings/imports_controller.rb
@ -5,7 +5,6 @@ class Settings::ImportsController < ApplicationController
  before_action :authenticate_user!
  before_action :set_account
  before_action :set_body_classes
  def show
    @import = Import.new
@ -32,8 +31,4 @@ class Settings::ImportsController < ApplicationController
  def import_params
    params.require(:import).permit(:data, :type)
  end
  def set_body_classes
    @body_classes = 'admin'
  end
 end
--- a/app/controllers/settings/migrations_controller.rb
+++ b/app/controllers/settings/migrations_controller.rb
@ -4,7 +4,6 @@ class Settings::MigrationsController < ApplicationController
  layout 'admin'
  before_action :authenticate_user!
  before_action :set_body_classes
  def show
    @migration = Form::Migration.new(account: current_account.moved_to_account)
@ -32,8 +31,4 @@ class Settings::MigrationsController < ApplicationController
    current_account.moved_to_account_id != @migration.account&.id &&
      current_account.id != @migration.account&.id
  end
  def set_body_classes
    @body_classes = 'admin'
  end
 end
--- a/app/controllers/settings/notifications_controller.rb
+++ b/app/controllers/settings/notifications_controller.rb
@ -4,7 +4,6 @@ class Settings::NotificationsController < ApplicationController
  layout 'admin'
  before_action :authenticate_user!
  before_action :set_body_classes
  def show; end
@ -30,8 +29,4 @@ class Settings::NotificationsController < ApplicationController
      interactions: %i(must_be_follower must_be_following must_be_following_dm)
    )
  end
  def set_body_classes
    @body_classes = 'admin'
  end
 end
--- a/app/controllers/settings/preferences_controller.rb
+++ b/app/controllers/settings/preferences_controller.rb
@ -4,7 +4,6 @@ class Settings::PreferencesController < ApplicationController
  layout 'admin'
  before_action :authenticate_user!
  before_action :set_body_classes
  def show; end
@ -41,8 +40,7 @@ class Settings::PreferencesController < ApplicationController
      :setting_boost_modal,
      :setting_delete_modal,
      :setting_auto_play_gif,
-      :setting_display_media,
+      :setting_display_sensitive_media,
      :setting_expand_spoilers,
      :setting_reduce_motion,
      :setting_system_font_ui,
      :setting_noindex,
@ -52,8 +50,4 @@ class Settings::PreferencesController < ApplicationController
      interactions: %i(must_be_follower must_be_following)
    )
  end
  def set_body_classes
    @body_classes = 'admin'
  end
 end
--- a/app/controllers/settings/profiles_controller.rb
+++ b/app/controllers/settings/profiles_controller.rb
@ -7,7 +7,6 @@ class Settings::ProfilesController < ApplicationController
  before_action :authenticate_user!
  before_action :set_account
  before_action :set_body_classes
  obfuscate_filename [:account, :avatar]
  obfuscate_filename [:account, :header]
@ -35,8 +34,4 @@ class Settings::ProfilesController < ApplicationController
  def set_account
    @account = current_user.account
  end
  def set_body_classes
    @body_classes = 'admin'
  end
 end
--- a/app/controllers/settings/sessions_controller.rb
+++ b/app/controllers/settings/sessions_controller.rb
@ -2,7 +2,6 @@
 class Settings::SessionsController < ApplicationController
  before_action :set_session, only: :destroy
  before_action :set_body_classes
  def destroy
    @session.destroy!
@ -15,8 +14,4 @@ class Settings::SessionsController < ApplicationController
  def set_session
    @session = current_user.session_activations.find(params[:id])
  end
  def set_body_classes
    @body_classes = 'admin'
  end
 end
--- a/app/controllers/settings/two_factor_authentication/confirmations_controller.rb
+++ b/app/controllers/settings/two_factor_authentication/confirmations_controller.rb
@ -7,7 +7,6 @@ module Settings
      before_action :authenticate_user!
      before_action :ensure_otp_secret
      before_action :set_body_classes
      def new
        prepare_two_factor_form
@ -44,10 +43,6 @@ module Settings
      def ensure_otp_secret
        redirect_to settings_two_factor_authentication_path unless current_user.otp_secret
      end
      def set_body_classes
        @body_classes = 'admin'
      end
    end
  end
 end
--- a/app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
+++ b/app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
@ -6,7 +6,6 @@ module Settings
      layout 'admin'
      before_action :authenticate_user!
      before_action :set_body_classes
      def create
        @recovery_codes = current_user.generate_otp_backup_codes!
@ -14,12 +13,6 @@ module Settings
        flash[:notice] = I18n.t('two_factor_authentication.recovery_codes_regenerated')
        render :index
      end
      private
      def set_body_classes
        @body_classes = 'admin'
      end
    end
  end
 end
--- a/app/controllers/settings/two_factor_authentications_controller.rb
+++ b/app/controllers/settings/two_factor_authentications_controller.rb
@ -6,7 +6,6 @@ module Settings
    before_action :authenticate_user!
    before_action :verify_otp_required, only: [:create]
    before_action :set_body_classes
    def show
      @confirmation = Form::TwoFactorConfirmation.new
@ -44,9 +43,5 @@ module Settings
      current_user.validate_and_consume_otp!(confirmation_params[:code]) ||
        current_user.invalidate_otp_backup_code!(confirmation_params[:code])
    end
    def set_body_classes
      @body_classes = 'admin'
    end
  end
 end
--- a/app/controllers/statuses_controller.rb
+++ b/app/controllers/statuses_controller.rb
@ -19,10 +19,6 @@ class StatusesController < ApplicationController
  before_action :set_referrer_policy_header, only: [:show]
  before_action :set_cache_headers
  content_security_policy only: :embed do |p|
    p.frame_ancestors(false)
  end
  def show
    respond_to do |format|
      format.html do
--- a/app/helpers/admin/account_moderation_notes_helper.rb
+++ b/app/helpers/admin/account_moderation_notes_helper.rb
@ -4,7 +4,7 @@ module Admin::AccountModerationNotesHelper
  def admin_account_link_to(account)
    return if account.nil?
-    link_to admin_account_path(account.id), class: name_tag_classes(account), title: account.acct do
+    link_to admin_account_path(account.id), class: name_tag_classes(account) do
      safe_join([
                  image_tag(account.avatar.url, width: 15, height: 15, alt: display_name(account), class: 'avatar'),
                  content_tag(:span, account.acct, class: 'username'),
@ -15,7 +15,7 @@ module Admin::AccountModerationNotesHelper
  def admin_account_inline_link_to(account)
    return if account.nil?
-    link_to admin_account_path(account.id), class: name_tag_classes(account, true), title: account.acct do
+    link_to admin_account_path(account.id), class: name_tag_classes(account, true) do
      content_tag(:span, account.acct, class: 'username')
    end
  end
--- a/app/helpers/admin/filter_helper.rb
+++ b/app/helpers/admin/filter_helper.rb
@ -1,7 +1,7 @@
 # frozen_string_literal: true
 module Admin::FilterHelper
-  ACCOUNT_FILTERS      = %i(local remote by_domain silenced suspended alphabetic username display_name email ip staff).freeze
+  ACCOUNT_FILTERS      = %i(local remote by_domain silenced suspended recent username display_name email ip staff).freeze
  REPORT_FILTERS       = %i(resolved account_id target_account_id).freeze
  INVITE_FILTER        = %i(available expired).freeze
  CUSTOM_EMOJI_FILTERS = %i(local remote by_domain shortcode).freeze
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@ -7,8 +7,8 @@ module ApplicationHelper
    follow
  ).freeze
-  def active_nav_class(*paths)
+  def active_nav_class(path)
-    paths.any? { |path| current_page?(path) } ? 'active' : ''
+    current_page?(path) ? 'active' : ''
  end
  def active_link_to(label, path, **options)
@ -81,20 +81,4 @@ module ApplicationHelper
    output << 'rtl' if locale_direction == 'rtl'
    output.reject(&:blank?).join(' ')
  end
  def cdn_host
    Rails.configuration.action_controller.asset_host
  end
  def cdn_host?
    cdn_host.present?
  end
  def storage_host
    "https://#{ENV['S3_ALIAS_HOST'].presence || ENV['S3_CLOUDFRONT_HOST']}"
  end
  def storage_host?
    ENV['S3_ALIAS_HOST'].present? || ENV['S3_CLOUDFRONT_HOST'].present?
  end
 end
--- a/app/helpers/home_helper.rb
+++ b/app/helpers/home_helper.rb
@ -7,13 +7,13 @@ module HomeHelper
    }
  end
-  def account_link_to(account, button = '', size: 36, path: nil)
+  def account_link_to(account, button = '')
    content_tag(:div, class: 'account') do
      content_tag(:div, class: 'account__wrapper') do
        section = if account.nil?
                    content_tag(:div, class: 'account__display-name') do
                      content_tag(:div, class: 'account__avatar-wrapper') do
-                        content_tag(:div, '', class: 'account__avatar', style: "width: #{size}px; height: #{size}px; background-size: #{size}px #{size}px; background-image: url(#{full_asset_url('avatars/original/missing.png', skip_pipeline: true)})")
+                        content_tag(:div, '', class: 'account__avatar', style: "background-image: url(#{full_asset_url('avatars/original/missing.png', skip_pipeline: true)})")
                      end +
                        content_tag(:span, class: 'display-name') do
                          content_tag(:strong, t('about.contact_missing')) +
@ -21,9 +21,9 @@ module HomeHelper
                        end
                    end
                  else
-                    link_to(path || TagManager.instance.url_for(account), class: 'account__display-name') do
+                    link_to(TagManager.instance.url_for(account), class: 'account__display-name') do
                      content_tag(:div, class: 'account__avatar-wrapper') do
-                        content_tag(:div, '', class: 'account__avatar', style: "width: #{size}px; height: #{size}px; background-size: #{size}px #{size}px; background-image: url(#{account.avatar.url})")
+                        content_tag(:div, '', class: 'account__avatar', style: "background-image: url(#{account.avatar.url})")
                      end +
                        content_tag(:span, class: 'display-name') do
                          content_tag(:bdi) do
@ -48,12 +48,4 @@ module HomeHelper
      '1+'
    end
  end
  def custom_field_classes(field)
    if field.verified?
      'verified'
    else
      'emojify'
    end
  end
 end
--- a/app/helpers/settings_helper.rb
+++ b/app/helpers/settings_helper.rb
@ -3,13 +3,11 @@
 module SettingsHelper
  HUMAN_LOCALES = {
    en: 'English',
    'en-CY': 'English (Cybre)',
    ar: 'العربية',
    ast: 'l\'asturianu',
    bg: 'Български',
    ca: 'Català',
    co: 'Corsu',
    cs: 'Čeština',
    cy: 'Cymraeg',
    da: 'Dansk',
    de: 'Deutsch',
--- a/app/javascript/fonts/premillenium/MSSansSerif.ttf
+++ b/app/javascript/fonts/premillenium/MSSansSerif.ttf
--- a/app/javascript/images/alert_badge.png
+++ b/app/javascript/images/alert_badge.png
--- a/app/javascript/images/background-cybre-light.png
+++ b/app/javascript/images/background-cybre-light.png
--- a/app/javascript/images/background-cybre.png
+++ b/app/javascript/images/background-cybre.png
--- a/app/javascript/images/clippy_frame.png
+++ b/app/javascript/images/clippy_frame.png
--- a/app/javascript/images/clippy_wave.gif
+++ b/app/javascript/images/clippy_wave.gif
--- a/app/javascript/images/elephant-fren.png
+++ b/app/javascript/images/elephant-fren.png
--- a/app/javascript/images/header-cybre-colour.jpg
+++ b/app/javascript/images/header-cybre-colour.jpg
--- a/app/javascript/images/header-cybre.jpeg
+++ b/app/javascript/images/header-cybre.jpeg
--- a/app/javascript/images/icon_about.png
+++ b/app/javascript/images/icon_about.png
--- a/app/javascript/images/icon_blocks.png
+++ b/app/javascript/images/icon_blocks.png
--- a/app/javascript/images/icon_direct.png
+++ b/app/javascript/images/icon_direct.png
--- a/app/javascript/images/icon_docs.png
+++ b/app/javascript/images/icon_docs.png
--- a/app/javascript/images/icon_domain_blocks.png
+++ b/app/javascript/images/icon_domain_blocks.png
--- a/app/javascript/images/icon_follow_requests.png
+++ b/app/javascript/images/icon_follow_requests.png
--- a/app/javascript/images/icon_home.png
+++ b/app/javascript/images/icon_home.png
--- a/app/javascript/images/icon_invite.png
+++ b/app/javascript/images/icon_invite.png
--- a/app/javascript/images/icon_keyboard_shortcuts.png
+++ b/app/javascript/images/icon_keyboard_shortcuts.png
--- a/app/javascript/images/icon_likes.png
+++ b/app/javascript/images/icon_likes.png
--- a/app/javascript/images/icon_lists.png
+++ b/app/javascript/images/icon_lists.png
--- a/app/javascript/images/icon_local.png
+++ b/app/javascript/images/icon_local.png
--- a/app/javascript/images/icon_logout.png
+++ b/app/javascript/images/icon_logout.png
--- a/app/javascript/images/icon_mutes.png
+++ b/app/javascript/images/icon_mutes.png
--- a/app/javascript/images/icon_notifications.png
+++ b/app/javascript/images/icon_notifications.png
--- a/app/javascript/images/icon_pin.png
+++ b/app/javascript/images/icon_pin.png
--- a/app/javascript/images/icon_public.png
+++ b/app/javascript/images/icon_public.png
--- a/app/javascript/images/icon_settings.png
+++ b/app/javascript/images/icon_settings.png
--- a/app/javascript/images/icon_tos.png
+++ b/app/javascript/images/icon_tos.png
--- a/app/javascript/images/logo-cybre-light.png
+++ b/app/javascript/images/logo-cybre-light.png
--- a/app/javascript/images/start.png
+++ b/app/javascript/images/start.png
--- a/app/javascript/mastodon/actions/cards.js
+++ b/app/javascript/mastodon/actions/cards.js
@ -0,0 +1,52 @@
 import api from '../api';
 export const STATUS_CARD_FETCH_REQUEST = 'STATUS_CARD_FETCH_REQUEST';
 export const STATUS_CARD_FETCH_SUCCESS = 'STATUS_CARD_FETCH_SUCCESS';
 export const STATUS_CARD_FETCH_FAIL    = 'STATUS_CARD_FETCH_FAIL';
 export function fetchStatusCard(id) {
  return (dispatch, getState) => {
    if (getState().getIn(['cards', id], null) !== null) {
      return;
    }
    dispatch(fetchStatusCardRequest(id));
    api(getState).get(`/api/v1/statuses/${id}/card`).then(response => {
      if (!response.data.url) {
        return;
      }
      dispatch(fetchStatusCardSuccess(id, response.data));
    }).catch(error => {
      dispatch(fetchStatusCardFail(id, error));
    });
  };
 };
 export function fetchStatusCardRequest(id) {
  return {
    type: STATUS_CARD_FETCH_REQUEST,
    id,
    skipLoading: true,
  };
 };
 export function fetchStatusCardSuccess(id, card) {
  return {
    type: STATUS_CARD_FETCH_SUCCESS,
    id,
    card,
    skipLoading: true,
  };
 };
 export function fetchStatusCardFail(id, error) {
  return {
    type: STATUS_CARD_FETCH_FAIL,
    id,
    error,
    skipLoading: true,
    skipAlert: true,
  };
 };
--- a/app/javascript/mastodon/actions/compose.js
+++ b/app/javascript/mastodon/actions/compose.js
@ -49,8 +49,6 @@ export const COMPOSE_UPLOAD_CHANGE_REQUEST     = 'COMPOSE_UPLOAD_UPDATE_REQUEST'
 export const COMPOSE_UPLOAD_CHANGE_SUCCESS     = 'COMPOSE_UPLOAD_UPDATE_SUCCESS';
 export const COMPOSE_UPLOAD_CHANGE_FAIL        = 'COMPOSE_UPLOAD_UPDATE_FAIL';
 export const COMPOSE_DOODLE_SET        = 'COMPOSE_DOODLE_SET';
 export function changeCompose(text) {
  return {
    type: COMPOSE_CHANGE,
@ -58,7 +56,7 @@ export function changeCompose(text) {
  };
 };
-export function replyCompose(status, routerHistory) {
+export function replyCompose(status, router) {
  return (dispatch, getState) => {
    dispatch({
      type: COMPOSE_REPLY,
@ -66,7 +64,7 @@ export function replyCompose(status, routerHistory) {
    });
    if (!getState().getIn(['compose', 'mounted'])) {
-      routerHistory.push('/statuses/new');
+      router.push('/statuses/new');
    }
  };
 };
@ -83,7 +81,7 @@ export function resetCompose() {
  };
 };
-export function mentionCompose(account, routerHistory) {
+export function mentionCompose(account, router) {
  return (dispatch, getState) => {
    dispatch({
      type: COMPOSE_MENTION,
@ -91,12 +89,12 @@ export function mentionCompose(account, routerHistory) {
    });
    if (!getState().getIn(['compose', 'mounted'])) {
-      routerHistory.push('/statuses/new');
+      router.push('/statuses/new');
    }
  };
 };
-export function directCompose(account, routerHistory) {
+export function directCompose(account, router) {
  return (dispatch, getState) => {
    dispatch({
      type: COMPOSE_DIRECT,
@ -104,12 +102,12 @@ export function directCompose(account, routerHistory) {
    });
    if (!getState().getIn(['compose', 'mounted'])) {
-      routerHistory.push('/statuses/new');
+      router.push('/statuses/new');
    }
  };
 };
-export function submitCompose(routerHistory) {
+export function submitCompose() {
  return function (dispatch, getState) {
    const status = getState().getIn(['compose', 'text'], '');
    const media  = getState().getIn(['compose', 'media_attachments']);
@ -135,24 +133,21 @@ export function submitCompose(routerHistory) {
      dispatch(insertIntoTagHistory(response.data.tags, status));
      dispatch(submitComposeSuccess({ ...response.data }));
-      // To make the app more responsive, immediately push the status
+      // To make the app more responsive, immediately get the status into the columns
      // into the columns
-      const insertIfOnline = timelineId => {
+      const insertIfOnline = (timelineId) => {
        if (getState().getIn(['timelines', timelineId, 'items', 0]) !== null) {
          dispatch(updateTimeline(timelineId, { ...response.data }));
        }
      };
-      if (response.data.visibility === 'direct' && getState().getIn(['conversations', 'mounted']) <= 0 && routerHistory) {
+      insertIfOnline('home');
        routerHistory.push('/timelines/direct');
      } else if (response.data.visibility !== 'direct') {
        insertIfOnline('home');
      }
      if (response.data.in_reply_to_id === null && response.data.visibility === 'public') {
        insertIfOnline('community');
        insertIfOnline('public');
      } else if (response.data.visibility === 'direct') {
        insertIfOnline('direct');
      }
    }).catch(function (error) {
      dispatch(submitComposeFail(error));
@ -180,13 +175,6 @@ export function submitComposeFail(error) {
  };
 };
 export function doodleSet(options) {
  return {
    type: COMPOSE_DOODLE_SET,
    options: options,
  };
 };
 export function uploadCompose(files) {
  return function (dispatch, getState) {
    if (getState().getIn(['compose', 'media_attachments']).size > 3) {
--- a/app/javascript/mastodon/actions/conversations.js
+++ b/app/javascript/mastodon/actions/conversations.js
@ -1,81 +0,0 @@
 import api, { getLinks } from '../api';
 import {
  importFetchedAccounts,
  importFetchedStatuses,
  importFetchedStatus,
 } from './importer';
 export const CONVERSATIONS_MOUNT   = 'CONVERSATIONS_MOUNT';
 export const CONVERSATIONS_UNMOUNT = 'CONVERSATIONS_UNMOUNT';
 export const CONVERSATIONS_FETCH_REQUEST = 'CONVERSATIONS_FETCH_REQUEST';
 export const CONVERSATIONS_FETCH_SUCCESS = 'CONVERSATIONS_FETCH_SUCCESS';
 export const CONVERSATIONS_FETCH_FAIL    = 'CONVERSATIONS_FETCH_FAIL';
 export const CONVERSATIONS_UPDATE        = 'CONVERSATIONS_UPDATE';
 export const CONVERSATIONS_READ = 'CONVERSATIONS_READ';
 export const mountConversations = () => ({
  type: CONVERSATIONS_MOUNT,
 });
 export const unmountConversations = () => ({
  type: CONVERSATIONS_UNMOUNT,
 });
 export const markConversationRead = conversationId => (dispatch, getState) => {
  dispatch({
    type: CONVERSATIONS_READ,
    id: conversationId,
  });
  api(getState).post(`/api/v1/conversations/${conversationId}/read`);
 };
 export const expandConversations = ({ maxId } = {}) => (dispatch, getState) => {
  dispatch(expandConversationsRequest());
  const params = { max_id: maxId };
  if (!maxId) {
    params.since_id = getState().getIn(['conversations', 0, 'last_status']);
  }
  api(getState).get('/api/v1/conversations', { params })
    .then(response => {
      const next = getLinks(response).refs.find(link => link.rel === 'next');
      dispatch(importFetchedAccounts(response.data.reduce((aggr, item) => aggr.concat(item.accounts), [])));
      dispatch(importFetchedStatuses(response.data.map(item => item.last_status).filter(x => !!x)));
      dispatch(expandConversationsSuccess(response.data, next ? next.uri : null));
    })
    .catch(err => dispatch(expandConversationsFail(err)));
 };
 export const expandConversationsRequest = () => ({
  type: CONVERSATIONS_FETCH_REQUEST,
 });
 export const expandConversationsSuccess = (conversations, next) => ({
  type: CONVERSATIONS_FETCH_SUCCESS,
  conversations,
  next,
 });
 export const expandConversationsFail = error => ({
  type: CONVERSATIONS_FETCH_FAIL,
  error,
 });
 export const updateConversations = conversation => dispatch => {
  dispatch(importFetchedAccounts(conversation.accounts));
  if (conversation.last_status) {
    dispatch(importFetchedStatus(conversation.last_status));
  }
  dispatch({
    type: CONVERSATIONS_UPDATE,
    conversation,
  });
 };
--- a/app/javascript/mastodon/actions/dropdown_menu.js
+++ b/app/javascript/mastodon/actions/dropdown_menu.js
@ -1,8 +1,8 @@
 export const DROPDOWN_MENU_OPEN = 'DROPDOWN_MENU_OPEN';
 export const DROPDOWN_MENU_CLOSE = 'DROPDOWN_MENU_CLOSE';
-export function openDropdownMenu(id, placement, keyboard) {
+export function openDropdownMenu(id, placement) {
-  return { type: DROPDOWN_MENU_OPEN, id, placement, keyboard };
+  return { type: DROPDOWN_MENU_OPEN, id, placement };
 }
 export function closeDropdownMenu(id) {
--- a/app/javascript/mastodon/actions/importer/normalizer.js
+++ b/app/javascript/mastodon/actions/importer/normalizer.js
@ -1,7 +1,6 @@
 import escapeTextContentForBrowser from 'escape-html';
 import emojify from '../../features/emoji/emoji';
 import { unescapeHTML } from '../../utils/html';
 import { expandSpoilers } from '../../initial_state';
 const domParser = new DOMParser();
@ -14,7 +13,7 @@ export function normalizeAccount(account) {
  account = { ...account };
  const emojiMap = makeEmojiMap(account);
-  const displayName = account.display_name.trim().length === 0 ? account.username : account.display_name;
+  const displayName = account.display_name.length === 0 ? account.username : account.display_name;
  account.display_name_html = emojify(escapeTextContentForBrowser(displayName), emojiMap);
  account.note_emojified = emojify(account.note, emojiMap);
@ -58,7 +57,7 @@ export function normalizeStatus(status, normalOldStatus) {
    normalStatus.search_index = domParser.parseFromString(searchContent, 'text/html').documentElement.textContent;
    normalStatus.contentHtml  = emojify(normalStatus.content, emojiMap);
    normalStatus.spoilerHtml  = emojify(escapeTextContentForBrowser(spoilerText), emojiMap);
-    normalStatus.hidden       = expandSpoilers ? false : spoilerText.length > 0 || normalStatus.sensitive;
+    normalStatus.hidden       = spoilerText.length > 0 || normalStatus.sensitive;
  }
  return normalStatus;
--- a/app/javascript/mastodon/actions/statuses.js
+++ b/app/javascript/mastodon/actions/statuses.js
@ -3,6 +3,7 @@ import openDB from '../storage/db';
 import { evictStatus } from '../storage/modifier';
 import { deleteFromTimelines } from './timelines';
 import { fetchStatusCard } from './cards';
 import { importFetchedStatus, importFetchedStatuses, importAccount, importStatus } from './importer';
 export const STATUS_FETCH_REQUEST = 'STATUS_FETCH_REQUEST';
@ -85,6 +86,7 @@ export function fetchStatus(id) {
    const skipLoading = getState().getIn(['statuses', id], null) !== null;
    dispatch(fetchContext(id));
    dispatch(fetchStatusCard(id));
    if (skipLoading) {
      return;
--- a/app/javascript/mastodon/actions/streaming.js
+++ b/app/javascript/mastodon/actions/streaming.js
@ -6,7 +6,6 @@ import {
  disconnectTimeline,
 } from './timelines';
 import { updateNotifications, expandNotifications } from './notifications';
 import { updateConversations } from './conversations';
 import { fetchFilters } from './filters';
 import { getLocale } from '../locales';
@ -32,9 +31,6 @@ export function connectTimelineStream (timelineId, path, pollingRefresh = null)
        case 'notification':
          dispatch(updateNotifications(JSON.parse(data.payload), messages, locale));
          break;
        case 'conversation':
          dispatch(updateConversations(JSON.parse(data.payload)));
          break;
        case 'filters_changed':
          dispatch(fetchFilters());
          break;
--- a/app/javascript/mastodon/actions/suggestions.js
+++ b/app/javascript/mastodon/actions/suggestions.js
@ -1,52 +0,0 @@
 import api from '../api';
 import { importFetchedAccounts } from './importer';
 export const SUGGESTIONS_FETCH_REQUEST = 'SUGGESTIONS_FETCH_REQUEST';
 export const SUGGESTIONS_FETCH_SUCCESS = 'SUGGESTIONS_FETCH_SUCCESS';
 export const SUGGESTIONS_FETCH_FAIL    = 'SUGGESTIONS_FETCH_FAIL';
 export const SUGGESTIONS_DISMISS = 'SUGGESTIONS_DISMISS';
 export function fetchSuggestions() {
  return (dispatch, getState) => {
    dispatch(fetchSuggestionsRequest());
    api(getState).get('/api/v1/suggestions').then(response => {
      dispatch(importFetchedAccounts(response.data));
      dispatch(fetchSuggestionsSuccess(response.data));
    }).catch(error => dispatch(fetchSuggestionsFail(error)));
  };
 };
 export function fetchSuggestionsRequest() {
  return {
    type: SUGGESTIONS_FETCH_REQUEST,
    skipLoading: true,
  };
 };
 export function fetchSuggestionsSuccess(accounts) {
  return {
    type: SUGGESTIONS_FETCH_SUCCESS,
    accounts,
    skipLoading: true,
  };
 };
 export function fetchSuggestionsFail(error) {
  return {
    type: SUGGESTIONS_FETCH_FAIL,
    error,
    skipLoading: true,
    skipAlert: true,
  };
 };
 export const dismissSuggestion = accountId => (dispatch, getState) => {
  dispatch({
    type: SUGGESTIONS_DISMISS,
    id: accountId,
  });
  api(getState).delete(`/api/v1/suggestions/${accountId}`);
 };
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Andrew	8efabda22b	Floppy disk on public views	2018-09-14 14:24:42 -07:00
chr	ce1c3b9f7a	2.4.2rc2 except without the bad stuff	2018-09-14 14:11:37 -07:00
chr	271850950b	Use cybrespace repo url in getting started footer	2018-09-11 20:18:36 -07:00
chr	0f674a42d8	Remove image file only used in cybre theme	2018-09-11 20:17:06 -07:00
Andrew	58c8fd96b6	Add new panels to branding	2018-09-11 20:17:06 -07:00
nightpool	d3b281e857	hide header image w/o css	2018-09-11 20:17:06 -07:00
Andrew	5c224d30c2	New landing page for 2.3	2018-09-11 20:17:06 -07:00
Andrew	8665b93bed	Cybrespace branding	2018-09-11 20:17:06 -07:00
`@ -1,2 +1,2 @@`
	`VAGRANT=true`	`VAGRANT=true`
	`LOCAL_DOMAIN=mastodon.local`	`LOCAL_DOMAIN=mastodon.dev`