Squashed commit of the following:

commit 2a08aca
Author: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date:   Thu Nov 7 00:55:22 2019 +0900

    Bump @babel/preset-env from 7.6.0 to 7.7.1 (mastodon#12318)

    Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.6.0 to 7.7.1.
    - [Release notes](https://github.com/babel/babel/releases)
    - [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
    - [Commits](babel/babel@v7.6.0...v7.7.1)

    Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

commit 0c20442
Author: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date:   Thu Nov 7 00:14:46 2019 +0900

    Bump tesseract.js from 2.0.0-alpha.16 to 2.0.0-beta.2 (mastodon#12311)

    Bumps [tesseract.js](https://github.com/naptha/tesseract.js) from 2.0.0-alpha.16 to 2.0.0-beta.2.
    - [Release notes](https://github.com/naptha/tesseract.js/releases)
    - [Commits](naptha/tesseract.js@v2.0.0-alpha.16...v2.0.0-beta.2)

    Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

commit 4c86b11
Author: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date:   Thu Nov 7 00:14:26 2019 +0900

    Bump glob from 7.1.4 to 7.1.5 (mastodon#12312)

    Bumps [glob](https://github.com/isaacs/node-glob) from 7.1.4 to 7.1.5.
    - [Release notes](https://github.com/isaacs/node-glob/releases)
    - [Changelog](https://github.com/isaacs/node-glob/blob/master/changelog.md)
    - [Commits](isaacs/node-glob@v7.1.4...v7.1.5)

    Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

commit c4cf93f
Author: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date:   Thu Nov 7 00:12:48 2019 +0900

    Bump sass from 1.23.1 to 1.23.3 (mastodon#12314)

    Bumps [sass](https://github.com/sass/dart-sass) from 1.23.1 to 1.23.3.
    - [Release notes](https://github.com/sass/dart-sass/releases)
    - [Changelog](https://github.com/sass/dart-sass/blob/master/CHANGELOG.md)
    - [Commits](sass/dart-sass@1.23.1...1.23.3)

    Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

commit 80b1a72
Author: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date:   Thu Nov 7 00:11:08 2019 +0900

    Bump @babel/preset-react from 7.0.0 to 7.6.3 (mastodon#12315)

    Bumps [@babel/preset-react](https://github.com/babel/babel) from 7.0.0 to 7.6.3.
    - [Release notes](https://github.com/babel/babel/releases)
    - [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
    - [Commits](babel/babel@v7.0.0...v7.6.3)

    Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

commit 42d9ca2
Author: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date:   Tue Nov 5 00:28:47 2019 +0900

    Bump webpack-cli from 3.3.9 to 3.3.10 (mastodon#12297)

    Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 3.3.9 to 3.3.10.
    - [Release notes](https://github.com/webpack/webpack-cli/releases)
    - [Changelog](https://github.com/webpack/webpack-cli/blob/v3.3.10/CHANGELOG.md)
    - [Commits](webpack/webpack-cli@v3.3.9...v3.3.10)

    Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

commit d84aca6
Author: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date:   Tue Nov 5 00:23:26 2019 +0900

    Bump react-overlays from 0.8.3 to 0.9.1 (mastodon#12298)

    Bumps [react-overlays](https://github.com/react-bootstrap/react-overlays) from 0.8.3 to 0.9.1.
    - [Release notes](https://github.com/react-bootstrap/react-overlays/releases)
    - [Changelog](https://github.com/react-bootstrap/react-overlays/blob/master/CHANGELOG.md)
    - [Commits](react-bootstrap/react-overlays@v0.8.3...v0.9.1)

    Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

commit 674a630
Author: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date:   Mon Nov 4 23:33:05 2019 +0900

    Bump @babel/plugin-proposal-object-rest-spread from 7.5.5 to 7.6.2 (mastodon#12296)

    Bumps [@babel/plugin-proposal-object-rest-spread](https://github.com/babel/babel) from 7.5.5 to 7.6.2.
    - [Release notes](https://github.com/babel/babel/releases)
    - [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
    - [Commits](babel/babel@v7.5.5...v7.6.2)

    Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

commit 0a9c2db
Author: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date:   Mon Nov 4 23:27:50 2019 +0900

    Bump webpack-dev-server from 3.8.1 to 3.9.0 (mastodon#12293)

    Bumps [webpack-dev-server](https://github.com/webpack/webpack-dev-server) from 3.8.1 to 3.9.0.
    - [Release notes](https://github.com/webpack/webpack-dev-server/releases)
    - [Changelog](https://github.com/webpack/webpack-dev-server/blob/master/CHANGELOG.md)
    - [Commits](webpack/webpack-dev-server@v3.8.1...v3.9.0)

    Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

commit 5c53740
Author: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date:   Mon Nov 4 23:27:07 2019 +0900

    Bump react-test-renderer from 16.10.2 to 16.11.0 (mastodon#12295)

    Bumps [react-test-renderer](https://github.com/facebook/react/tree/HEAD/packages/react-test-renderer) from 16.10.2 to 16.11.0.
    - [Release notes](https://github.com/facebook/react/releases)
    - [Changelog](https://github.com/facebook/react/blob/master/CHANGELOG.md)
    - [Commits](https://github.com/facebook/react/commits/v16.11.0/packages/react-test-renderer)

    Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

commit c21c7a2
Author: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date:   Mon Nov 4 23:21:40 2019 +0900

    Bump wavesurfer.js from 3.0.0 to 3.2.0 (mastodon#12292)

    Bumps [wavesurfer.js](https://github.com/katspaugh/wavesurfer.js) from 3.0.0 to 3.2.0.
    - [Release notes](https://github.com/katspaugh/wavesurfer.js/releases)
    - [Changelog](https://github.com/katspaugh/wavesurfer.js/blob/master/CHANGES.md)
    - [Commits](katspaugh/wavesurfer.js@3.0.0...3.2.0)

    Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

commit 086a921
Author: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date:   Mon Nov 4 23:15:23 2019 +0900

    Bump react-toggle from 4.0.2 to 4.1.1 (mastodon#12291)

    Bumps [react-toggle](https://github.com/aaronshaf/react-toggle) from 4.0.2 to 4.1.1.
    - [Release notes](https://github.com/aaronshaf/react-toggle/releases)
    - [Changelog](https://github.com/aaronshaf/react-toggle/blob/master/CHANGELOG.md)
    - [Commits](https://github.com/aaronshaf/react-toggle/commits)

    Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

commit a537d08
Author: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date:   Mon Nov 4 22:55:46 2019 +0900

    Bump react-dom from 16.10.2 to 16.11.0 (mastodon#12289)

    Bumps [react-dom](https://github.com/facebook/react/tree/HEAD/packages/react-dom) from 16.10.2 to 16.11.0.
    - [Release notes](https://github.com/facebook/react/releases)
    - [Changelog](https://github.com/facebook/react/blob/master/CHANGELOG.md)
    - [Commits](https://github.com/facebook/react/commits/v16.11.0/packages/react-dom)

    Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

commit 3cc9ff8
Author: Gabriel Rubens <gabrielrumiranda@gmail.com>
Date:   Mon Nov 4 09:03:44 2019 -0300

    Use inert polyfill (mastodon#12209)

    * Inserting wicg-inert in project

    * Import wicg-inert in moda_root component

    * Update yarn.lock

    * Solving code style problems

    * Removing package-lock

commit be93318
Author: mayaeh <mayaeh@marimo-net.org>
Date:   Mon Nov 4 21:03:29 2019 +0900

    Integrate own poll's translation into own_poll. (mastodon#12231)

    run `yarn manage:translations en`

commit 1e232e4
Author: Nolan Lawson <nolan@nolanlawson.com>
Date:   Mon Nov 4 04:03:09 2019 -0800

    fix: support KaiOS arrow navigation on public pages (mastodon#12251)

commit e37358b
Author: ThibG <thib@sitedethib.com>
Date:   Mon Nov 4 13:02:27 2019 +0100

    Fix code referencing wrong class (mastodon#12263)

    For some reason, I have seen this only triggered here:
    https://circleci.com/gh/tootsuite/mastodon/98324?utm_campaign=vcs-integration-link&utm_medium=referral&utm_source=github-checks-link

    But Follow.find_by referenced the ActivityPub::Activity::Follow class
    instead of the model class.

commit 3db3c10
Author: ThibG <thib@sitedethib.com>
Date:   Mon Nov 4 13:02:16 2019 +0100

    Fix filtered out items being counted as pending items (mastodon#12266)

commit 65e13cf
Author: ThibG <thib@sitedethib.com>
Date:   Mon Nov 4 13:02:01 2019 +0100

    Add abilityto add oneself to lists (mastodon#12271)

    * Add ability to add oneself to lists

    * Change search results to include oneself when searching through followers

    * Mark follow relation as optional in ListAccount

commit 1a12943
Author: ThibG <thib@sitedethib.com>
Date:   Mon Nov 4 13:01:50 2019 +0100

    Fix notification filters not applying to poll options (mastodon#12269)

commit 1018097
Author: Scott Sweeny <scott@ssweeny.net>
Date:   Mon Nov 4 07:01:38 2019 -0500

    Fix crowdin badge display in CONTRIBUTING.md (mastodon#12273)

    * Fix crowdin badge display in CONTRIBUTING.md

    The Crowdin localization badge in `CONTRIBUTING.md` appeared to have the wrong markup around it. This manifested in some extra brackets and an unformatted `crowdin` string.

    * Make Crowdin badge a link to the Mastodon project

commit 650820d
Author: ThibG <thib@sitedethib.com>
Date:   Mon Nov 4 13:00:16 2019 +0100

    Fix remote media descriptions being cut off at 420 chars (mastodon#12262)

    * Fix remote media descriptions being cut off at 420 chars

    Fixes mastodon#12258

    * Fix tests

commit 7488a9e
Author: ThibG <thib@sitedethib.com>
Date:   Mon Nov 4 12:59:17 2019 +0100

    Add support for submitting media description with ctrl+enter (mastodon#12272)

commit 8568018
Author: Hinaloe <hina@hinaloe.net>
Date:   Mon Nov 4 20:58:19 2019 +0900

    dont crash with null-ref (mastodon#12274)

commit 3b609da
Author: David Caldwell <david+github@porkrind.org>
Date:   Mon Nov 4 03:56:21 2019 -0800

    Dockerfile: put back EXPOSE directive (mastodon#12279)

    [Rkt](https://coreos.com/rkt) doesn't allow ports to be exposed to containers unless they are declared in the container manifest. Re-adding EXPOSE back in (removed in 1dbf993) allows the container to be used on rkt based systems.

commit 23ed930
Author: Nathaniel Suchy <me@lunorian.is>
Date:   Mon Nov 4 06:55:20 2019 -0500

    Add `tootctl media lookup` command (mastodon#12283)

    * Add a lookup tool to the media cli

    * Improved lookup logic

    * Clarified wording in the output

    * Code style changes

    * Code style changes

    * Code style changes

    * Code style changes

    * Add error handling code incase an attachment isn't found

    * Code style changes

    * Code style changes

    * Make requested changes

    * Fix styling issues

    * Handle other media types

    * Remove an inadvertently added log

    * Make requested changes

    * Make the code safe no matter what the path, S3 or not

    * Code style changes

    * Code style changes

    * Replace select method with Ruby Enumerable grep method

commit 71cd41a
Author: Nathaniel Suchy <me@lunorian.is>
Date:   Mon Nov 4 06:54:08 2019 -0500

    Update .gitignore (mastodon#12287)

commit 685b0db
Author: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date:   Wed Oct 30 19:58:11 2019 +0900

    Bump aws-sdk-s3 from 1.48.0 to 1.52.0 (mastodon#12250)

    Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.48.0 to 1.52.0.
    - [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
    - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md)
    - [Commits](aws/aws-sdk-ruby@v1.48.0...v1.52.0)

    Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

commit 741a85c
Author: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date:   Wed Oct 30 19:04:00 2019 +0900

    Bump annotate from 2.7.5 to 3.0.2 (mastodon#12100)

    Bumps [annotate](https://github.com/ctran/annotate_models) from 2.7.5 to 3.0.2.
    - [Release notes](https://github.com/ctran/annotate_models/releases)
    - [Changelog](https://github.com/ctran/annotate_models/blob/develop/CHANGELOG.rdoc)
    - [Commits](ctran/annotate_models@v2.7.5...v3.0.2)

    Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

commit 0745fa8
Author: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date:   Wed Oct 30 19:00:41 2019 +0900

    [Security] Bump simple_form from 4.1.0 to 5.0.1 (mastodon#12099)

    Bumps [simple_form](https://github.com/plataformatec/simple_form) from 4.1.0 to 5.0.1. **This update includes a security fix.**
    - [Release notes](https://github.com/plataformatec/simple_form/releases)
    - [Changelog](https://github.com/plataformatec/simple_form/blob/master/CHANGELOG.md)
    - [Commits](heartcombo/simple_form@v4.1.0...v5.0.1)

    Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

commit 291106e
Author: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date:   Tue Oct 29 19:40:52 2019 +0900

    Bump rspec-rails from 3.8.2 to 3.9.0 (mastodon#12241)

    Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 3.8.2 to 3.9.0.
    - [Release notes](https://github.com/rspec/rspec-rails/releases)
    - [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md)
    - [Commits](rspec/rspec-rails@v3.8.2...v3.9.0)

    Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

commit 52c9044
Author: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date:   Tue Oct 29 11:12:05 2019 +0900

    Bump dotenv from 8.0.0 to 8.2.0 (mastodon#12235)

    Bumps [dotenv](https://github.com/motdotla/dotenv) from 8.0.0 to 8.2.0.
    - [Release notes](https://github.com/motdotla/dotenv/releases)
    - [Changelog](https://github.com/motdotla/dotenv/blob/master/CHANGELOG.md)
    - [Commits](motdotla/dotenv@v8.0.0...v8.2.0)

    Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

commit 008d15d
Author: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date:   Tue Oct 29 10:59:12 2019 +0900

    Bump terser-webpack-plugin from 1.4.1 to 2.2.1 (mastodon#12233)

    Bumps [terser-webpack-plugin](https://github.com/webpack-contrib/terser-webpack-plugin) from 1.4.1 to 2.2.1.
    - [Release notes](https://github.com/webpack-contrib/terser-webpack-plugin/releases)
    - [Changelog](https://github.com/webpack-contrib/terser-webpack-plugin/blob/master/CHANGELOG.md)
    - [Commits](webpack/terser-webpack-plugin@v1.4.1...v2.2.1)

    Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

commit e551274
Author: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date:   Tue Oct 29 10:55:56 2019 +0900

    Bump strong_migrations from 0.4.1 to 0.4.2 (mastodon#12242)

    Bumps [strong_migrations](https://github.com/ankane/strong_migrations) from 0.4.1 to 0.4.2.
    - [Release notes](https://github.com/ankane/strong_migrations/releases)
    - [Changelog](https://github.com/ankane/strong_migrations/blob/master/CHANGELOG.md)
    - [Commits](ankane/strong_migrations@v0.4.1...v0.4.2)

    Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

commit 0caa707
Author: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date:   Tue Oct 29 10:55:07 2019 +0900

    Bump active_record_query_trace from 1.6.2 to 1.7 (mastodon#12243)

    Bumps [active_record_query_trace](https://github.com/brunofacca/active-record-query-trace) from 1.6.2 to 1.7.
    - [Release notes](https://github.com/brunofacca/active-record-query-trace/releases)
    - [Changelog](https://github.com/brunofacca/active-record-query-trace/blob/master/HISTORY.md)
    - [Commits](brunofacca/active-record-query-trace@v1.6.2...v1.7)

    Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

commit 254ddfc
Author: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date:   Mon Oct 28 20:48:08 2019 +0900

    Bump pkg-config from 1.3.9 to 1.4.0 (mastodon#12239)

    Bumps [pkg-config](https://github.com/ruby-gnome/pkg-config) from 1.3.9 to 1.4.0.
    - [Release notes](https://github.com/ruby-gnome/pkg-config/releases)
    - [Changelog](https://github.com/ruby-gnome/pkg-config/blob/master/NEWS)
    - [Commits](ruby-gnome/pkg-config@1.3.9...1.4.0)

    Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

commit 4ecfd43
Author: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date:   Mon Oct 28 20:47:14 2019 +0900

    Bump faker from 2.5.0 to 2.6.0 (mastodon#12244)

    Bumps [faker](https://github.com/faker-ruby/faker) from 2.5.0 to 2.6.0.
    - [Release notes](https://github.com/faker-ruby/faker/releases)
    - [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md)
    - [Commits](faker-ruby/faker@v2.5.0...v2.6.0)

    Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

commit da67b1f
Author: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date:   Mon Oct 28 20:46:31 2019 +0900

    Bump webpack-bundle-analyzer from 3.5.2 to 3.6.0 (mastodon#12237)

    Bumps [webpack-bundle-analyzer](https://github.com/webpack-contrib/webpack-bundle-analyzer) from 3.5.2 to 3.6.0.
    - [Release notes](https://github.com/webpack-contrib/webpack-bundle-analyzer/releases)
    - [Changelog](https://github.com/webpack-contrib/webpack-bundle-analyzer/blob/master/CHANGELOG.md)
    - [Commits](webpack/webpack-bundle-analyzer@v3.5.2...v3.6.0)

    Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

commit 3565fc1
Author: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date:   Mon Oct 28 20:42:47 2019 +0900

    Bump eslint-plugin-react from 7.14.3 to 7.16.0 (mastodon#12234)

    Bumps [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react) from 7.14.3 to 7.16.0.
    - [Release notes](https://github.com/yannickcr/eslint-plugin-react/releases)
    - [Changelog](https://github.com/yannickcr/eslint-plugin-react/blob/master/CHANGELOG.md)
    - [Commits](jsx-eslint/eslint-plugin-react@v7.14.3...v7.16.0)

    Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

commit 91b02af
Author: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date:   Mon Oct 28 20:37:40 2019 +0900

    Bump sass from 1.23.0 to 1.23.1 (mastodon#12238)

    Bumps [sass](https://github.com/sass/dart-sass) from 1.23.0 to 1.23.1.
    - [Release notes](https://github.com/sass/dart-sass/releases)
    - [Changelog](https://github.com/sass/dart-sass/blob/master/CHANGELOG.md)
    - [Commits](sass/dart-sass@1.23.0...1.23.1)

    Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

commit 7be994e
Author: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date:   Mon Oct 28 20:04:24 2019 +0900

    Bump @babel/plugin-proposal-decorators from 7.4.4 to 7.6.0 (mastodon#12232)

    Bumps [@babel/plugin-proposal-decorators](https://github.com/babel/babel) from 7.4.4 to 7.6.0.
    - [Release notes](https://github.com/babel/babel/releases)
    - [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
    - [Commits](babel/babel@v7.4.4...v7.6.0)

    Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

commit a4301b5
Author: Yamagishi Kazutoshi <ykzts@desire.sh>
Date:   Sun Oct 27 20:46:35 2019 +0900

    Fix notification message for own poll (mastodon#12219)

commit 5b46467
Author: Takeshi Umeda <noel.yoshiba@gmail.com>
Date:   Sun Oct 27 20:45:55 2019 +0900

    Fix an issue where polls with 'expires_at' not set expired (mastodon#12222)

commit 7512f3a
Author: Yamagishi Kazutoshi <ykzts@desire.sh>
Date:   Sun Oct 27 20:45:33 2019 +0900

    Change message of public timeline for local only (mastodon#12224)

commit 4988ebb
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Sat Oct 26 12:45:52 2019 +0200

    Change stale bot to only touch pull requests over 120 days old (mastodon#12217)

commit 9b36f62
Author: Nima Boscarino <nima.boscarino@gmail.com>
Date:   Fri Oct 25 02:48:20 2019 -0700

    Add download button to audio and video players (mastodon#12179)

    * Add download button for audio player

    * Add download button for video player

    * fix padding for download button in Audio component

commit 91945aa
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Fri Oct 25 11:47:40 2019 +0200

    Create stale.yml (mastodon#12207)

Author: hiyuki2578

.gitignore

@@ -55,6 +55,9 @@ npm-debug.log
 yarn-error.log
 yarn-debug.log
 
+# Ignore vagrant log files
+ubuntu-xenial-16.04-cloudimg-console.log
+
 # Ignore Docker option files
 docker-compose.override.yml
 

CONTRIBUTING.md

@@ -20,7 +20,7 @@ Bug reports and feature suggestions can be submitted to [GitHub Issues](https://
 
 You can submit translations via [Crowdin](https://crowdin.com/project/mastodon). They are periodically merged into the codebase.
 
-[![Crowdin](https://d322cqt584bo4o.cloudfront.net/mastodon/localized.svg)][crowdin]
+[![Crowdin](https://d322cqt584bo4o.cloudfront.net/mastodon/localized.svg)](https://crowdin.com/project/mastodon)
 
 ## Pull requests
 

Dockerfile

@@ -123,3 +123,4 @@ RUN cd ~ && \
 # Set the work dir and the container entry point
 WORKDIR /opt/mastodon
 ENTRYPOINT ["/tini", "--"]
+EXPOSE 3000 4000

Gemfile

@@ -15,7 +15,7 @@ gem 'makara', '~> 0.4'
 gem 'pghero', '~> 2.3'
 gem 'dotenv-rails', '~> 2.7'
 
-gem 'aws-sdk-s3', '~> 1.48', require: false
+gem 'aws-sdk-s3', '~> 1.52', require: false
 gem 'fog-core', '<= 2.1.0'
 gem 'fog-openstack', '~> 0.3', require: false
 gem 'paperclip', '~> 6.0'
@@ -85,7 +85,7 @@ gem 'sidekiq-scheduler', '~> 3.0'
 gem 'sidekiq-unique-jobs', '~> 6.0'
 gem 'sidekiq-bulk', '~>0.2.0'
 gem 'simple-navigation', '~> 4.1'
-gem 'simple_form', '~> 4.1'
+gem 'simple_form', '~> 5.0'
 gem 'sprockets-rails', '~> 3.2', require: 'sprockets/railtie'
 gem 'stoplight', '~> 2.1.3'
 gem 'strong_migrations', '~> 0.4'
@@ -127,7 +127,7 @@ end
 
 group :development do
   gem 'active_record_query_trace', '~> 1.7'
-  gem 'annotate', '~> 2.7'
+  gem 'annotate', '~> 3.0'
   gem 'better_errors', '~> 2.5'
   gem 'binding_of_caller', '~> 0.7'
   gem 'bullet', '~> 6.0'

Gemfile.lock

@@ -95,7 +95,7 @@ GEM
       public_suffix (>= 2.0.2, < 5.0)
     airbrussh (1.3.4)
       sshkit (>= 1.6.1, != 1.7.0)
-    annotate (2.7.5)
+    annotate (3.0.2)
       activerecord (>= 3.2, < 7.0)
       rake (>= 10.4, < 13.0)
     arel (9.0.0)
@@ -105,17 +105,17 @@ GEM
     av (0.9.0)
       cocaine (~> 0.5.3)
     aws-eventstream (1.0.3)
-    aws-partitions (1.207.0)
-    aws-sdk-core (3.65.1)
+    aws-partitions (1.230.0)
+    aws-sdk-core (3.72.0)
       aws-eventstream (~> 1.0, >= 1.0.2)
-      aws-partitions (~> 1.0)
+      aws-partitions (~> 1, >= 1.228.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.24.0)
-      aws-sdk-core (~> 3, >= 3.61.1)
+    aws-sdk-kms (1.25.0)
+      aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.48.0)
-      aws-sdk-core (~> 3, >= 3.61.1)
+    aws-sdk-s3 (1.52.0)
+      aws-sdk-core (~> 3, >= 3.71.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
     aws-sigv4 (1.1.0)
@@ -596,7 +596,7 @@ GEM
       thor (~> 0)
     simple-navigation (4.1.0)
       activesupport (>= 2.3.2)
-    simple_form (4.1.0)
+    simple_form (5.0.1)
       actionpack (>= 5.0)
       activemodel (>= 5.0)
     simplecov (0.17.1)
@@ -680,8 +680,8 @@ DEPENDENCIES
   active_model_serializers (~> 0.10)
   active_record_query_trace (~> 1.7)
   addressable (~> 2.7)
-  annotate (~> 2.7)
-  aws-sdk-s3 (~> 1.48)
+  annotate (~> 3.0)
+  aws-sdk-s3 (~> 1.52)
   better_errors (~> 2.5)
   binding_of_caller (~> 0.7)
   blurhash (~> 0.1)
@@ -786,7 +786,7 @@ DEPENDENCIES
   sidekiq-scheduler (~> 3.0)
   sidekiq-unique-jobs (~> 6.0)
   simple-navigation (~> 4.1)
-  simple_form (~> 4.1)
+  simple_form (~> 5.0)
   simplecov (~> 0.17)
   sprockets-rails (~> 3.2)
   stackprof

app/javascript/mastodon/actions/importer/normalizer.js

@@ -10,6 +10,12 @@ const makeEmojiMap = record => record.emojis.reduce((obj, emoji) => {
   return obj;
 }, {});
 
+export function searchTextFromRawStatus (status) {
+  const spoilerText   = status.spoiler_text || '';
+  const searchContent = ([spoilerText, status.content].concat((status.poll && status.poll.options) ? status.poll.options.map(option => option.title) : [])).join('\n\n').replace(/<br\s*\/?>/g, '\n').replace(/<\/p><p>/g, '\n\n');
+  return domParser.parseFromString(searchContent, 'text/html').documentElement.textContent;
+}
+
 export function normalizeAccount(account) {
   account = { ...account };
 

app/javascript/mastodon/actions/notifications.js

@@ -14,6 +14,7 @@ import { unescapeHTML } from '../utils/html';
 import { getFiltersRegex } from '../selectors';
 import { usePendingItems as preferPendingItems } from 'mastodon/initial_state';
 import compareId from 'mastodon/compare_id';
+import { searchTextFromRawStatus } from 'mastodon/actions/importer/normalizer';
 
 export const NOTIFICATIONS_UPDATE      = 'NOTIFICATIONS_UPDATE';
 export const NOTIFICATIONS_UPDATE_NOOP = 'NOTIFICATIONS_UPDATE_NOOP';
@@ -60,7 +61,7 @@ export function updateNotifications(notification, intlMessages, intlLocale) {
     if (notification.type === 'mention') {
       const dropRegex   = filters[0];
       const regex       = filters[1];
-      const searchIndex = notification.status.spoiler_text + '\n' + unescapeHTML(notification.status.content);
+      const searchIndex = searchTextFromRawStatus(notification.status);
 
       if (dropRegex && dropRegex.test(searchIndex)) {
         return;

app/javascript/mastodon/components/modal_root.js

@@ -1,5 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import 'wicg-inert';
 
 export default class ModalRoot extends React.PureComponent {
 

app/javascript/mastodon/features/notifications/components/notification.js

@@ -229,7 +229,7 @@ class Notification extends ImmutablePureComponent {
 
             <span title={notification.get('created_at')}>
               {ownPoll ? (
-                <FormattedMessage id='notification.ownPoll' defaultMessage='Your poll has ended' />
+                <FormattedMessage id='notification.own_poll' defaultMessage='Your poll has ended' />
               ) : (
                 <FormattedMessage id='notification.poll' defaultMessage='A poll you have voted in has ended' />
               )}

app/javascript/mastodon/features/ui/components/focal_point_modal.js

@@ -184,6 +184,15 @@ class FocalPointModal extends ImmutablePureComponent {
     this.setState({ description: e.target.value, dirty: true });
   }
 
+  handleKeyDown = (e) => {
+    if (e.keyCode === 13 && (e.ctrlKey || e.metaKey)) {
+      e.preventDefault();
+      e.stopPropagation();
+      this.setState({ description: e.target.value, dirty: true });
+      this.handleSubmit();
+    }
+  }
+
   handleSubmit = () => {
     this.props.onSave(this.state.description, this.state.focusX, this.state.focusY);
     this.props.onClose();
@@ -254,6 +263,7 @@ class FocalPointModal extends ImmutablePureComponent {
                 className='setting-text light'
                 value={detecting ? '…' : description}
                 onChange={this.handleChange}
+                onKeyDown={this.handleKeyDown}
                 disabled={detecting}
                 autoFocus
               />