hamptonmoore
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,982 Commits
7 Branches
0 Tags
179 MiB
Commit Graph

661 Commits (31fc3be0a4342dbe91480d058b0afeddb272ed3b)

Author SHA1 Message Date
Yamagishi Kazutoshi 70423ce81f require rubocop-rails in .rubocop.yml (#10974) 
* Revert "Revert #10957 (rubocop-rails) which is incompatible with CodeClimate (#10965)"

This reverts commit 121d19d7fa.

* Disable Rails/HelperInstanceVariable
 2019-06-06 12:31:48 +02:00
Thibaut Girka 02b56c7e1a Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream 2019-06-04 20:40:19 +02:00
Yamagishi Kazutoshi 121d19d7fa Revert #10957 (rubocop-rails) which is incompatible with CodeClimate (#10965) 2019-06-04 19:35:19 +02:00
Yamagishi Kazutoshi 3e56f95c73 Replace from scss-lint to sass-lint (#10958) 2019-06-04 17:23:18 +02:00
Yamagishi Kazutoshi 3f536f06d6 Use rubocop-rails (#10957) 2019-06-04 15:25:52 +02:00
dependabot-preview[bot] 07aebe1417 Bump webpacker from 4.0.6 to 4.0.7 (#10948) 
Bumps [webpacker](https://github.com/rails/webpacker) from 4.0.6 to 4.0.7.
- [Release notes](https://github.com/rails/webpacker/releases)
- [Changelog](https://github.com/rails/webpacker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rails/webpacker/compare/v4.0.6...v4.0.7)
 2019-06-04 20:50:06 +09:00
dependabot-preview[bot] c11742dd9b Bump fuubar from 2.3.2 to 2.4.0 (#10947) 
Bumps [fuubar](https://github.com/thekompanee/fuubar) from 2.3.2 to 2.4.0.
- [Release notes](https://github.com/thekompanee/fuubar/releases)
- [Changelog](https://github.com/thekompanee/fuubar/blob/master/CHANGELOG.md)
- [Commits](https://github.com/thekompanee/fuubar/compare/releases/v2.3.2...releases/v2.4.0)
 2019-06-04 14:15:32 +09:00
Thibaut Girka 76918554a6 Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream 
Conflicts:
- Gemfile.lock
- config/webpack/rules/css.js
- package.json
- yarn.lock
 2019-06-03 14:54:30 +02:00
dependabot-preview[bot] 01e5bf8520 Bump webpacker from 4.0.5 to 4.0.6 (#10905) 
Bumps [webpacker](https://github.com/rails/webpacker) from 4.0.5 to 4.0.6.
- [Release notes](https://github.com/rails/webpacker/releases)
- [Changelog](https://github.com/rails/webpacker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rails/webpacker/compare/v4.0.5...v4.0.6)
 2019-05-31 20:44:00 +09:00
dependabot-preview[bot] bee0a0582c Bump webpacker from 4.0.4 to 4.0.5 (#10903) 
Bumps [webpacker](https://github.com/rails/webpacker) from 4.0.4 to 4.0.5.
- [Release notes](https://github.com/rails/webpacker/releases)
- [Changelog](https://github.com/rails/webpacker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rails/webpacker/compare/v4.0.4...v4.0.5)
 2019-05-31 07:28:05 +09:00
dependabot-preview[bot] 4e32b17aa4 Bump redis from 4.1.1 to 4.1.2 (#10899) 
Bumps [redis](https://github.com/redis/redis-rb) from 4.1.1 to 4.1.2.
- [Release notes](https://github.com/redis/redis-rb/releases)
- [Changelog](https://github.com/redis/redis-rb/blob/master/CHANGELOG.md)
- [Commits](https://github.com/redis/redis-rb/compare/v4.1.1...v4.1.2)
 2019-05-30 23:50:33 +09:00
dependabot-preview[bot] 5677172d86 Bump rubocop from 0.70.0 to 0.71.0 (#10901) 
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.70.0 to 0.71.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.70.0...v0.71.0)
 2019-05-30 23:17:54 +09:00
Thibaut Girka 06036081a0 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-30 13:31:01 +02:00
dependabot-preview[bot] dee4f1878d Bump aws-sdk-s3 from 1.40.0 to 1.41.0 (#10892) 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.40.0 to 1.41.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](https://github.com/aws/aws-sdk-ruby/compare/v1.40.0...v1.41.0)
 2019-05-30 12:58:22 +09:00
dependabot-preview[bot] fa48cf96de Bump capybara from 3.21.0 to 3.22.0 (#10893) 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.21.0 to 3.22.0.
- [Release notes](https://github.com/teamcapybara/capybara/releases)
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](https://github.com/teamcapybara/capybara/compare/3.21.0...3.22.0)
 2019-05-30 09:37:11 +09:00
dependabot-preview[bot] 26e290ae64 Bump strong_migrations from 0.3.1 to 0.4.0 (#10871) 
Bumps [strong_migrations](https://github.com/ankane/strong_migrations) from 0.3.1 to 0.4.0.
- [Release notes](https://github.com/ankane/strong_migrations/releases)
- [Changelog](https://github.com/ankane/strong_migrations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ankane/strong_migrations/compare/v0.3.1...v0.4.0)
 2019-05-29 18:22:59 +09:00
dependabot-preview[bot] bdf4ac1172 Bump webpacker from 4.0.2 to 4.0.4 (#10882) 
Bumps [webpacker](https://github.com/rails/webpacker) from 4.0.2 to 4.0.4.
- [Release notes](https://github.com/rails/webpacker/releases)
- [Changelog](https://github.com/rails/webpacker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rails/webpacker/compare/v4.0.2...v4.0.4)
 2019-05-29 18:16:07 +09:00
dependabot-preview[bot] 61ab5b0c83 Bump capybara from 3.20.2 to 3.21.0 (#10854) 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.20.2 to 3.21.0.
- [Release notes](https://github.com/teamcapybara/capybara/releases)
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](https://github.com/teamcapybara/capybara/compare/3.20.2...3.21.0)
 2019-05-29 11:21:22 +09:00
dependabot-preview[bot] 0b1c7150da Bump tty-prompt from 0.18.1 to 0.19.0 (#10870) 
Bumps [tty-prompt](https://github.com/piotrmurach/tty-prompt) from 0.18.1 to 0.19.0.
- [Release notes](https://github.com/piotrmurach/tty-prompt/releases)
- [Changelog](https://github.com/piotrmurach/tty-prompt/blob/master/CHANGELOG.md)
- [Commits](https://github.com/piotrmurach/tty-prompt/compare/v0.18.1...v0.19.0)
 2019-05-29 11:10:24 +09:00
Thibaut Girka 3d73d76e55 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-28 17:45:06 +02:00
dependabot-preview[bot] b1133f1ff9 Bump ox from 2.10.0 to 2.10.1 (#10869) 
Bumps [ox](https://github.com/ohler55/ox) from 2.10.0 to 2.10.1.
- [Release notes](https://github.com/ohler55/ox/releases)
- [Changelog](https://github.com/ohler55/ox/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ohler55/ox/compare/v2.10.0...v2.10.1)
 2019-05-28 20:26:36 +09:00
Thibaut Girka c0dc247bce Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/models/account.rb
- app/views/settings/profiles/show.html.haml
- spec/controllers/api/v1/accounts/credentials_controller_spec.rb

Conflicts were due to an increase in account bio length upstream, which
is already covered in glitch-soc through `MAX_BIO_CHARS`.
 2019-05-23 19:01:30 +02:00
dependabot[bot] ce8de3a6e5 Bump aws-sdk-s3 from 1.39.0 to 1.40.0 (#10803) 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.39.0 to 1.40.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](https://github.com/aws/aws-sdk-ruby/compare/v1.39.0...v1.40.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-22 22:31:05 +09:00
dependabot[bot] bc23de458e Bump rubocop from 0.69.0 to 0.70.0 (#10802) 
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.69.0 to 0.70.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.69.0...v0.70.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-22 22:09:10 +09:00
dependabot[bot] 4d65740663 Bump httplog from 1.2.2 to 1.3.0 (#10795) 
Bumps [httplog](https://github.com/trusche/httplog) from 1.2.2 to 1.3.0.
- [Release notes](https://github.com/trusche/httplog/releases)
- [Changelog](https://github.com/trusche/httplog/blob/master/CHANGELOG.md)
- [Commits](https://github.com/trusche/httplog/commits/v1.3.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-21 15:41:15 +09:00
dependabot[bot] 77e2b68b66 Bump lograge from 0.11.0 to 0.11.1 (#10793) 
Bumps [lograge](https://github.com/roidrage/lograge) from 0.11.0 to 0.11.1.
- [Release notes](https://github.com/roidrage/lograge/releases)
- [Changelog](https://github.com/roidrage/lograge/blob/master/CHANGELOG.md)
- [Commits](https://github.com/roidrage/lograge/compare/v0.11.0...v0.11.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-20 15:19:56 +09:00
dependabot[bot] ace6bd3570 Bump capybara from 3.20.0 to 3.20.2 (#10794) 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.20.0 to 3.20.2.
- [Release notes](https://github.com/teamcapybara/capybara/releases)
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](https://github.com/teamcapybara/capybara/compare/3.20.0...3.20.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-20 15:18:28 +09:00
Thibaut Girka 6e227ecb04 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-18 10:04:32 +02:00
Thibaut Girka 94aef563b9 Add support for markdown-formatted toots 2019-05-17 23:51:14 +02:00
dependabot[bot] e976a9dfbd Bump aws-sdk-s3 from 1.38.0 to 1.39.0 (#10773) 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.38.0 to 1.39.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](https://github.com/aws/aws-sdk-ruby/compare/v1.38.0...v1.39.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-17 15:23:21 +09:00
dependabot[bot] 2310dd40fa Bump capybara from 3.19.1 to 3.20.0 (#10768) 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.19.1 to 3.20.0.
- [Release notes](https://github.com/teamcapybara/capybara/releases)
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](https://github.com/teamcapybara/capybara/compare/3.19.1...3.20.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-16 16:13:52 +09:00
dependabot[bot] 90093f1795 Bump aws-sdk-s3 from 1.36.1 to 1.38.0 (#10769) 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.36.1 to 1.38.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](https://github.com/aws/aws-sdk-ruby/compare/v1.36.1...v1.38.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-16 15:00:24 +09:00
Thibaut Girka 6badf2d252 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-15 17:11:40 +02:00
dependabot[bot] 76901b65c4 Bump capybara from 3.18.0 to 3.19.1 (#10758) 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.18.0 to 3.19.1.
- [Release notes](https://github.com/teamcapybara/capybara/releases)
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](https://github.com/teamcapybara/capybara/compare/3.18.0...3.19.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-14 15:01:47 +09:00
dependabot[bot] 5a24275202 Bump brakeman from 4.5.0 to 4.5.1 (#10757) 
Bumps [brakeman](https://github.com/presidentbeef/brakeman) from 4.5.0 to 4.5.1.
- [Release notes](https://github.com/presidentbeef/brakeman/releases)
- [Changelog](https://github.com/presidentbeef/brakeman/blob/master/CHANGES.md)
- [Commits](https://github.com/presidentbeef/brakeman/compare/v4.5.0...v4.5.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-14 15:01:22 +09:00
dependabot[bot] d90104204f Bump rubocop from 0.68.1 to 0.69.0 (#10762) 
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.68.1 to 0.69.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.68.1...v0.69.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-14 15:00:58 +09:00
Thibaut Girka 68629f2773 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/statuses_controller.rb
  minor conflict because of glitch-soc's theming system
- app/controllers/stream_entries_controller.rb
  minor conflict because of glitch-soc's theming system
 2019-05-10 17:09:12 +02:00
dependabot[bot] fbff73eccb Bump redis from 4.1.0 to 4.1.1 (#10722) 
Bumps [redis](https://github.com/redis/redis-rb) from 4.1.0 to 4.1.1.
- [Release notes](https://github.com/redis/redis-rb/releases)
- [Changelog](https://github.com/redis/redis-rb/blob/master/CHANGELOG.md)
- [Commits](https://github.com/redis/redis-rb/compare/v4.1.0...v4.1.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-07 14:47:46 +09:00
dependabot[bot] 7e73a8b8bf Bump parallel_tests from 2.28.0 to 2.29.0 (#10716) 
Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.28.0 to 2.29.0.
- [Release notes](https://github.com/grosser/parallel_tests/releases)
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.28.0...v2.29.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-06 15:12:55 +09:00
Thibaut Girka 832cf92c74 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-05 12:28:10 +02:00
Eugen Rochko f0865171fe
Bump blurhash from 0.1.2 to 0.1.3 (#10700) 2019-05-04 22:52:54 +02:00
Thibaut Girka 33c80e0783 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/models/media_attachment.rb
 2019-05-04 16:37:26 +02:00
dependabot[bot] ecbea2e3c6 Bump rack-attack from 5.4.2 to 6.0.0 (#10599) 
* Bump rack-attack from 5.4.2 to 6.0.0

Bumps [rack-attack](https://github.com/kickstarter/rack-attack) from 5.4.2 to 6.0.0.
- [Release notes](https://github.com/kickstarter/rack-attack/releases)
- [Changelog](https://github.com/kickstarter/rack-attack/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kickstarter/rack-attack/compare/v5.4.2...v6.0.0)

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

* fix payload[:request]
 2019-05-03 16:16:11 +02:00
dependabot[bot] 61e28b0ccc Bump scss_lint from 0.57.1 to 0.58.0 (#10678) 
Bumps [scss_lint](https://github.com/sds/scss-lint) from 0.57.1 to 0.58.0.
- [Release notes](https://github.com/sds/scss-lint/releases)
- [Changelog](https://github.com/sds/scss-lint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sds/scss-lint/compare/v0.57.1...v0.58.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-03 17:29:53 +09:00
dependabot[bot] 153b4ffc78 Bump fabrication from 2.20.1 to 2.20.2 (#10677) 
Bumps [fabrication](https://github.com/paulelliott/fabrication) from 2.20.1 to 2.20.2.
- [Release notes](https://github.com/paulelliott/fabrication/releases)
- [Changelog](https://github.com/paulelliott/fabrication/blob/master/Changelog.markdown)
- [Commits](https://github.com/paulelliott/fabrication/compare/2.20.1...2.20.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-03 15:01:38 +09:00
dependabot[bot] 699109b954 Bump rubocop from 0.68.0 to 0.68.1 (#10658) 
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.68.0 to 0.68.1.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.68.0...v0.68.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-01 15:49:16 +09:00
dependabot[bot] 825d5c79b7 Bump annotate from 2.7.4 to 2.7.5 (#10651) 
Bumps [annotate](https://github.com/ctran/annotate_models) from 2.7.4 to 2.7.5.
- [Release notes](https://github.com/ctran/annotate_models/releases)
- [Changelog](https://github.com/ctran/annotate_models/blob/develop/CHANGELOG.rdoc)
- [Commits](https://github.com/ctran/annotate_models/compare/v2.7.4...2.7.5)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-30 18:06:09 +02:00
dependabot[bot] 7c94b190c8 Bump bullet from 5.9.0 to 6.0.0 (#10635) 
Bumps [bullet](https://github.com/flyerhzm/bullet) from 5.9.0 to 6.0.0.
- [Release notes](https://github.com/flyerhzm/bullet/releases)
- [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/flyerhzm/bullet/compare/5.9.0...6.0.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-30 18:05:49 +02:00
dependabot[bot] feff0fc9b2 Bump rubocop from 0.67.2 to 0.68.0 (#10654) 
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.67.2 to 0.68.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.67.2...v0.68.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-30 18:05:22 +02:00
Eugen Rochko fba96c808d
Add blurhash (#10630) 
* Add blurhash

* Use fallback color for spoiler when blurhash missing

* Federate the blurhash and accept it as long as it's at most 5x5

* Display unknown media attachments as blurhash placeholders

* Improve style of embed actions and spoiler button

* Change blurhash resolution from 3x3 to 4x4

* Improve dependency definitions

* Fix code style issues
 2019-04-27 03:24:09 +02:00
dependabot[bot] 8f4c34669f Bump bootsnap from 1.4.3 to 1.4.4 (#10634) 
Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.4.3 to 1.4.4.
- [Release notes](https://github.com/Shopify/bootsnap/releases)
- [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.4.3...v1.4.4)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-25 13:36:56 +02:00
Thibaut Girka 7783ec921b Merge branch 'master' into glitch-soc/merge-upstream 2019-04-24 15:25:22 +02:00
dependabot[bot] 80bbf40ff1 Bump sidekiq from 5.2.6 to 5.2.7 (#10627) 
Bumps [sidekiq](https://github.com/mperham/sidekiq) from 5.2.6 to 5.2.7.
- [Release notes](https://github.com/mperham/sidekiq/releases)
- [Changelog](https://github.com/mperham/sidekiq/blob/master/Changes.md)
- [Commits](https://github.com/mperham/sidekiq/compare/v5.2.6...v5.2.7)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-23 16:39:06 +02:00
dependabot[bot] db61383f82 Bump capybara from 3.17.0 to 3.18.0 (#10626) 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.17.0 to 3.18.0.
- [Release notes](https://github.com/teamcapybara/capybara/releases)
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](https://github.com/teamcapybara/capybara/compare/3.17.0...3.18.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-23 18:53:52 +09:00
dependabot[bot] f99bfb9496 [Security] Bump nokogiri from 1.10.2 to 1.10.3 (#10620) 
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.2 to 1.10.3. **This update includes security fixes.**
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.2...v1.10.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-23 10:02:58 +09:00
dependabot[bot] 703cdf2a0c Bump capybara from 3.16.2 to 3.17.0 (#10602) 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.16.2 to 3.17.0.
- [Release notes](https://github.com/teamcapybara/capybara/releases)
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](https://github.com/teamcapybara/capybara/compare/3.16.2...3.17.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-23 00:54:51 +02:00
Thibaut Girka a9eaa780f5 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/javascript/mastodon/features/compose/components/compose_form.js
  Upstream cleaned up a bit, including on lines in which
  we replaced the hardcoded 500 character limit with a maxChar
  constant. Applied the changes while keeping maxChar instead of 500.
- app/javascript/packs/public.js
  Moved upstream's new animated avatar hover handling in
  app/javascript/core/public.js
- app/javascript/styles/fonts/montserrat.scss
  Upstream fixed local font name, applied those changes.
- app/javascript/styles/fonts/roboto.scss
  Upstream fixed local font name, applied those changes.
- lib/mastodon/version.rb
  Upstream made repo URL configurable, did the same, but
  default to glitch-soc
 2019-04-22 20:40:04 +02:00
dependabot[bot] fd9f5a467f Bump aws-sdk-s3 from 1.36.0 to 1.36.1 (#10618) 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.36.0 to 1.36.1.
- [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](https://github.com/aws/aws-sdk-ruby/compare/v1.36.0...v1.36.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-22 15:03:20 +02:00
dependabot[bot] 5c34163dbc Bump doorkeeper from 5.0.2 to 5.1.0 (#10598) 
Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper) from 5.0.2 to 5.1.0.
- [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases)
- [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/master/NEWS.md)
- [Commits](https://github.com/doorkeeper-gem/doorkeeper/compare/v5.0.2...v5.1.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-22 15:02:59 +02:00
dependabot[bot] c9441bf82e Bump cld3 from 3.2.3 to 3.2.4 (#10617) 
Bumps [cld3](https://github.com/akihikodaki/cld3-ruby) from 3.2.3 to 3.2.4.
- [Release notes](https://github.com/akihikodaki/cld3-ruby/releases)
- [Commits](https://github.com/akihikodaki/cld3-ruby/compare/v3.2.3...v3.2.4)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-22 14:54:19 +02:00
dependabot[bot] aa484e2cb3 Bump webpush from 0.3.7 to 0.3.8 (#10592) 
Bumps [webpush](https://github.com/zaru/webpush) from 0.3.7 to 0.3.8.
- [Release notes](https://github.com/zaru/webpush/releases)
- [Changelog](https://github.com/zaru/webpush/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zaru/webpush/compare/v0.3.7...v0.3.8)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-21 04:49:44 +02:00
dependabot[bot] a5c0aae984 Bump lograge from 0.10.0 to 0.11.0 (#10588) 
Bumps [lograge](https://github.com/roidrage/lograge) from 0.10.0 to 0.11.0.
- [Release notes](https://github.com/roidrage/lograge/releases)
- [Changelog](https://github.com/roidrage/lograge/blob/master/CHANGELOG.md)
- [Commits](https://github.com/roidrage/lograge/compare/v0.10.0...v0.11.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-21 04:49:05 +02:00
Thibaut Girka 268417daf3 Merge branch 'master' into glitch-soc/merge-upstream 2019-04-19 10:44:10 +02:00
dependabot[bot] 15ec1a738e Bump sidekiq from 5.2.5 to 5.2.6 (#10582) 
Bumps [sidekiq](https://github.com/mperham/sidekiq) from 5.2.5 to 5.2.6.
- [Release notes](https://github.com/mperham/sidekiq/releases)
- [Changelog](https://github.com/mperham/sidekiq/blob/master/Changes.md)
- [Commits](https://github.com/mperham/sidekiq/compare/v5.2.5...v5.2.6)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-16 22:00:56 +09:00
dependabot[bot] c469e48e03 Bump sidekiq-unique-jobs from 6.0.12 to 6.0.13 (#10580) 
Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs) from 6.0.12 to 6.0.13.
- [Release notes](https://github.com/mhenrixon/sidekiq-unique-jobs/releases)
- [Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v6.0.12...v6.0.13)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-16 22:00:15 +09:00
dependabot[bot] d20b1bab24 Bump oj from 3.7.11 to 3.7.12 (#10581) 
Bumps [oj](https://github.com/ohler55/oj) from 3.7.11 to 3.7.12.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.7.11...v3.7.12)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-15 19:51:10 +09:00
dependabot[bot] 9588cf82ce Bump rubocop from 0.67.1 to 0.67.2 (#10500) 
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.67.1 to 0.67.2.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.67.1...v0.67.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-13 21:24:44 +09:00
dependabot[bot] bce757fdd8 Bump capybara from 3.16.1 to 3.16.2 (#10552) 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.16.1 to 3.16.2.
- [Release notes](https://github.com/teamcapybara/capybara/releases)
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](https://github.com/teamcapybara/capybara/compare/3.16.1...3.16.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-13 21:24:19 +09:00
Thibaut Girka 5085559b15 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/views/admin/pending_accounts/index.html.haml
  No real conflict, upstream changes too close to glitch-specific
  theming system changes.
- config/navigation.rb
  Upstream redesigned the settings navigation, took those changes
  and re-inserted the flavours menu.
 2019-04-10 09:16:08 +02:00
dependabot[bot] 0f3719f16f Bump hamlit-rails from 0.2.2 to 0.2.3 (#10522) 
Bumps [hamlit-rails](https://github.com/mfung/hamlit-rails) from 0.2.2 to 0.2.3.
- [Release notes](https://github.com/mfung/hamlit-rails/releases)
- [Commits](https://github.com/mfung/hamlit-rails/compare/v0.2.2...v0.2.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-09 17:23:52 +09:00
dependabot[bot] 819d053be8 Bump bootsnap from 1.4.2 to 1.4.3 (#10523) 
Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.4.2 to 1.4.3.
- [Release notes](https://github.com/Shopify/bootsnap/releases)
- [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.4.2...v1.4.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-09 17:23:18 +09:00
Thibaut Girka f5f6d23d55 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- config/locales/pl.yml
  Conflict caused by new upstream string too close to glitch-specific
  “flavour” string. Took both strings.
 2019-04-08 15:57:56 +02:00
dependabot[bot] fb8557e652 Bump rubocop from 0.66.0 to 0.67.1 (#10475) 
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.66.0 to 0.67.1.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.66.0...v0.67.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-06 11:41:19 +09:00
Thibaut Girka 1682ac5717 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/following_accounts_controller.rb
  Conflicts were due to glitch-soc's theming system.
- app/javascript/packs/public.js
  Some code has been change upstream, but it has been
  moved to app/javascript/core/settings.js in glitch-soc.
  Applied the changes there.
 2019-04-04 14:53:52 +02:00
dependabot[bot] f86b2d8edb Bump i18n-tasks from 0.9.28 to 0.9.29 (#10451) 
Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks) from 0.9.28 to 0.9.29.
- [Release notes](https://github.com/glebm/i18n-tasks/releases)
- [Changelog](https://github.com/glebm/i18n-tasks/blob/master/CHANGES.md)
- [Commits](https://github.com/glebm/i18n-tasks/compare/v0.9.28...v0.9.29)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-02 14:38:16 +09:00
dependabot[bot] 6024964b1e Bump capybara from 3.16.0 to 3.16.1 (#10450) 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.16.0 to 3.16.1.
- [Release notes](https://github.com/teamcapybara/capybara/releases)
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](https://github.com/teamcapybara/capybara/compare/3.16.0...3.16.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-02 14:34:37 +09:00
Thibaut Girka 4444d8f9b3 Merge branch 'master' into glitch-soc/merge-upstream 2019-03-30 12:36:24 +01:00
dependabot[bot] 3b1c64cadc Bump capybara from 3.15.0 to 3.16.0 (#10415) 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.15.0 to 3.16.0.
- [Release notes](https://github.com/teamcapybara/capybara/releases)
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](https://github.com/teamcapybara/capybara/compare/3.15.0...3.16.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-29 22:06:56 +09:00
Thibaut Girka 050efbc126 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/workers/activitypub/distribute_poll_update_worker.rb
- config/locales/pl.yml
 2019-03-28 13:01:33 +01:00
dependabot[bot] 24d5b6f9e3 Bump aws-sdk-s3 from 1.35.0 to 1.36.0 (#10406) 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.35.0 to 1.36.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](https://github.com/aws/aws-sdk-ruby/compare/v1.35.0...v1.36.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-28 16:25:27 +09:00
dependabot[bot] 85629bf3d3 Bump rails from 5.2.2.1 to 5.2.3 (#10407) 
Bumps [rails](https://github.com/rails/rails) from 5.2.2.1 to 5.2.3.
- [Release notes](https://github.com/rails/rails/releases)
- [Commits](https://github.com/rails/rails/compare/v5.2.2.1...v5.2.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-28 16:25:11 +09:00
dependabot[bot] f46f67d984 [Security] Bump devise from 4.5.0 to 4.6.2 (#10394) 
Bumps [devise](https://github.com/plataformatec/devise) from 4.5.0 to 4.6.2. **This update includes security fixes.**
- [Release notes](https://github.com/plataformatec/devise/releases)
- [Changelog](https://github.com/plataformatec/devise/blob/master/CHANGELOG.md)
- [Commits](https://github.com/plataformatec/devise/compare/v4.5.0...v4.6.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-28 02:20:53 +01:00
dependabot[bot] 319bce3d9d Bump tzinfo-data from 1.2018.9 to 1.2019.1 (#10396) 
Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data) from 1.2018.9 to 1.2019.1.
- [Release notes](https://github.com/tzinfo/tzinfo-data/releases)
- [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2018.9...v1.2019.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-27 17:45:31 +01:00
dependabot[bot] 852ca12753 Bump bootsnap from 1.4.1 to 1.4.2 (#10395) 
Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.4.1 to 1.4.2.
- [Release notes](https://github.com/Shopify/bootsnap/releases)
- [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.4.1...v1.4.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-27 17:44:49 +01:00
Thibaut Girka b9f314bba7 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- config/locales/es.yml
- config/locales/pl.yml
- config/locales/pt-BR.yml
 2019-03-26 16:02:54 +01:00
Thibaut Girka fcce135d27 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/admin/settings_controller.rb
- app/models/form/admin_settings.rb

Conflicts caused by upstream refactoring, while we have
flavours and skins, with the flavour_and_skin pseudo-setting.
 2019-03-26 16:01:59 +01:00
dependabot[bot] 0c1a05b281 Bump makara from 0.4.0 to 0.4.1 (#10382) 
Bumps [makara]() from 0.4.0 to 0.4.1.

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-26 12:53:11 +01:00
dependabot[bot] 792a0f106e Bump dotenv-rails from 2.7.1 to 2.7.2 (#10381) 
Bumps [dotenv-rails](https://github.com/bkeepers/dotenv) from 2.7.1 to 2.7.2.
- [Release notes](https://github.com/bkeepers/dotenv/releases)
- [Changelog](https://github.com/bkeepers/dotenv/blob/master/Changelog.md)
- [Commits](https://github.com/bkeepers/dotenv/compare/v2.7.1...v2.7.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-26 18:37:04 +09:00
dependabot[bot] 6968ae79a0 Bump nokogiri from 1.10.1 to 1.10.2 (#10380) 
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.1 to 1.10.2.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.1...v1.10.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-26 18:36:17 +09:00
dependabot[bot] ac0cc692f5 Bump aws-sdk-s3 from 1.34.0 to 1.35.0 (#10369) 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.34.0 to 1.35.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](https://github.com/aws/aws-sdk-ruby/compare/v1.34.0...v1.35.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-25 20:54:00 +01:00
dependabot[bot] 035828f8c0 Bump rack-cors from 1.0.2 to 1.0.3 (#10368) 
Bumps [rack-cors](https://github.com/cyu/rack-cors) from 1.0.2 to 1.0.3.
- [Release notes](https://github.com/cyu/rack-cors/releases)
- [Changelog](https://github.com/cyu/rack-cors/blob/master/CHANGELOG.md)
- [Commits](https://github.com/cyu/rack-cors/compare/v1.0.2...v1.0.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-25 15:27:46 +01:00
dependabot[bot] 013a9e0bed Bump memory_profiler from 0.9.12 to 0.9.13 (#10341) 
Bumps [memory_profiler](https://github.com/SamSaffron/memory_profiler) from 0.9.12 to 0.9.13.
- [Release notes](https://github.com/SamSaffron/memory_profiler/releases)
- [Changelog](https://github.com/SamSaffron/memory_profiler/blob/master/CHANGELOG.md)
- [Commits](https://github.com/SamSaffron/memory_profiler/compare/v0.9.12...v0.9.13)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-22 22:43:22 +09:00
dependabot[bot] d23ff0c5c9 Bump aws-sdk-s3 from 1.33.0 to 1.34.0 (#10342) 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.33.0 to 1.34.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](https://github.com/aws/aws-sdk-ruby/compare/v1.33.0...v1.34.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-22 22:42:59 +09:00
Thibaut Girka edd5441112 Merge branch 'master' into glitch-soc/merge-upstream 2019-03-22 13:05:17 +01:00
dependabot[bot] d66bbdd353 Bump puma from 3.12.0 to 3.12.1 (#10331) 
Bumps [puma](https://github.com/puma/puma) from 3.12.0 to 3.12.1.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v3.12.0...v3.12.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-21 19:03:02 +09:00
dependabot[bot] 4f91c8510f Bump oj from 3.7.10 to 3.7.11 (#10332) 
Bumps [oj](https://github.com/ohler55/oj) from 3.7.10 to 3.7.11.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.7.10...v3.7.11)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-21 19:02:48 +09:00
dependabot[bot] 88be18125e Bump capybara from 3.14.0 to 3.15.0 (#10330) 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.14.0 to 3.15.0.
- [Release notes](https://github.com/teamcapybara/capybara/releases)
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](https://github.com/teamcapybara/capybara/compare/3.14.0...3.15.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-21 19:02:21 +09:00
Thibaut Girka 1d6152f440 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- config/locales/en.yml
  Conflict caused by the glitch-soc-specific “flavour” string being too close
  to the newly introduced “identity_proofs” string. Just included both.
 2019-03-20 13:54:00 +01:00
dependabot[bot] 941b0adcae Bump aws-sdk-s3 from 1.32.0 to 1.33.0 (#10319) 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.32.0 to 1.33.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](https://github.com/aws/aws-sdk-ruby/compare/v1.32.0...v1.33.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-19 16:34:21 +01:00
dependabot[bot] c95e3a2e34 Bump rubocop from 0.65.0 to 0.66.0 (#10318) 
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.65.0 to 0.66.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.65.0...v0.66.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-19 16:34:04 +01:00