fedca2934d
Bump brakeman from 5.0.1 to 5.0.4 ( #16397 )
...
Bumps [brakeman](https://github.com/presidentbeef/brakeman ) from 5.0.1 to 5.0.4.
- [Release notes](https://github.com/presidentbeef/brakeman/releases )
- [Changelog](https://github.com/presidentbeef/brakeman/blob/main/CHANGES.md )
- [Commits](https://github.com/presidentbeef/brakeman/commits )
---
updated-dependencies:
- dependency-name: brakeman
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-06-14 23:59:46 +09:00
f22862aabe
Bump redis from 4.2.5 to 4.3.1 ( #16396 )
...
Bumps [redis](https://github.com/redis/redis-rb ) from 4.2.5 to 4.3.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.2.5...v4.3.1 )
---
updated-dependencies:
- dependency-name: redis
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-06-14 23:58:47 +09:00
a5c16a484e
Bump strong_migrations from 0.7.6 to 0.7.7 ( #16393 )
...
Bumps [strong_migrations](https://github.com/ankane/strong_migrations ) from 0.7.6 to 0.7.7.
- [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.7.6...v0.7.7 )
---
updated-dependencies:
- dependency-name: strong_migrations
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-06-14 23:57:17 +09:00
e00ad693d1
Bump idn-ruby from 0.1.0 to 0.1.2 ( #16392 )
...
Bumps [idn-ruby](https://github.com/deepfryed/idn-ruby ) from 0.1.0 to 0.1.2.
- [Release notes](https://github.com/deepfryed/idn-ruby/releases )
- [Changelog](https://github.com/deepfryed/idn-ruby/blob/master/CHANGES )
- [Commits](https://github.com/deepfryed/idn-ruby/commits/v0.1.2 )
---
updated-dependencies:
- dependency-name: idn-ruby
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-06-14 23:56:57 +09:00
95b1b7148e
Bump sidekiq-scheduler from 3.0.1 to 3.1.0 ( #16365 )
...
Bumps [sidekiq-scheduler](https://github.com/moove-it/sidekiq-scheduler ) from 3.0.1 to 3.1.0.
- [Release notes](https://github.com/moove-it/sidekiq-scheduler/releases )
- [Commits](https://github.com/moove-it/sidekiq-scheduler/compare/v3.0.1...v3.1.0 )
---
updated-dependencies:
- dependency-name: sidekiq-scheduler
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-06-10 23:46:18 +09:00
0ef975e699
Bump rubocop from 1.15.0 to 1.16.0 ( #16368 )
...
Bumps [rubocop](https://github.com/rubocop/rubocop ) from 1.15.0 to 1.16.0.
- [Release notes](https://github.com/rubocop/rubocop/releases )
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop/rubocop/compare/v1.15.0...v1.16.0 )
---
updated-dependencies:
- dependency-name: rubocop
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-06-10 23:46:04 +09:00
549f5fb014
Bump aws-sdk-s3 from 1.95.1 to 1.96.0 ( #16372 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.95.1 to 1.96.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/commits )
---
updated-dependencies:
- dependency-name: aws-sdk-s3
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-06-10 23:45:27 +09:00
f2b3cf027e
Bump concurrent-ruby from 1.1.8 to 1.1.9 ( #16373 )
...
Bumps [concurrent-ruby](https://github.com/ruby-concurrency/concurrent-ruby ) from 1.1.8 to 1.1.9.
- [Release notes](https://github.com/ruby-concurrency/concurrent-ruby/releases )
- [Changelog](https://github.com/ruby-concurrency/concurrent-ruby/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ruby-concurrency/concurrent-ruby/compare/v1.1.8...v1.1.9 )
---
updated-dependencies:
- dependency-name: concurrent-ruby
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-06-10 23:44:19 +09:00
82e3dce602
Bump fastimage from 2.2.3 to 2.2.4 ( #16370 )
...
Bumps [fastimage](https://github.com/sdsykes/fastimage ) from 2.2.3 to 2.2.4.
- [Release notes](https://github.com/sdsykes/fastimage/releases )
- [Changelog](https://github.com/sdsykes/fastimage/blob/master/CHANGELOG )
- [Commits](https://github.com/sdsykes/fastimage/compare/v2.2.3...v2.2.4 )
---
updated-dependencies:
- dependency-name: fastimage
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-06-07 21:07:14 +09:00
8362943696
Bump sidekiq-unique-jobs from 7.0.11 to 7.0.12 ( #16367 )
...
Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs ) from 7.0.11 to 7.0.12.
- [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/v7.0.11...v7.0.12 )
---
updated-dependencies:
- dependency-name: sidekiq-unique-jobs
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-06-07 21:02:34 +09:00
0531e0335d
Bump makara from 0.5.0 to 0.5.1 ( #16369 )
...
Bumps [makara](https://github.com/instacart/makara ) from 0.5.0 to 0.5.1.
- [Release notes](https://github.com/instacart/makara/releases )
- [Changelog](https://github.com/instacart/makara/blob/v0.5.1/CHANGELOG.md )
- [Commits](https://github.com/instacart/makara/compare/v0.5.0...v0.5.1 )
---
updated-dependencies:
- dependency-name: makara
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-06-07 21:01:34 +09:00
f40c163ad1
Bump nokogiri from 1.11.6 to 1.11.7 ( #16366 )
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.11.6 to 1.11.7.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases )
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md )
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.11.6...v1.11.7 )
---
updated-dependencies:
- dependency-name: nokogiri
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-06-07 21:01:12 +09:00
2c6b9d2636
Bump ox from 2.14.4 to 2.14.5 ( #16364 )
...
Bumps [ox](https://github.com/ohler55/ox ) from 2.14.4 to 2.14.5.
- [Release notes](https://github.com/ohler55/ox/releases )
- [Changelog](https://github.com/ohler55/ox/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/ohler55/ox/compare/v2.14.4...v2.14.5 )
---
updated-dependencies:
- dependency-name: ox
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-06-07 21:00:49 +09:00
d79e99d11e
Merge branch 'main' into glitch-soc/merge-upstream
2021-06-03 20:47:02 +02:00
3a53d986f2
Bump nokogiri from 1.11.5 to 1.11.6 ( #16332 )
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.11.5 to 1.11.6.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases )
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md )
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.11.5...v1.11.6 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-06-01 13:11:23 +09:00
06fb51549d
Bump aws-sdk-s3 from 1.95.0 to 1.95.1 ( #16333 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.95.0 to 1.95.1.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/commits )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-06-01 13:11:10 +09:00
c8639cd7df
Merge branch 'main' into glitch-soc/merge-upstream
2021-05-31 11:53:57 +02:00
2aa461dc06
Bump rubocop from 1.14.0 to 1.15.0 ( #16300 )
...
Bumps [rubocop](https://github.com/rubocop/rubocop ) from 1.14.0 to 1.15.0.
- [Release notes](https://github.com/rubocop/rubocop/releases )
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop/rubocop/compare/v1.14.0...v1.15.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-29 09:17:34 +09:00
5dd885144a
Bump httplog from 1.4.3 to 1.5.0 ( #16303 )
...
Bumps [httplog](https://github.com/trusche/httplog ) from 1.4.3 to 1.5.0.
- [Release notes](https://github.com/trusche/httplog/releases )
- [Changelog](https://github.com/trusche/httplog/blob/v1.5.0/CHANGELOG.md )
- [Commits](https://github.com/trusche/httplog/compare/v1.4.3...v1.5.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-29 09:17:23 +09:00
3b59abdd99
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream's README got updated, but we have a completely different one.
Kept ours.
2021-05-27 17:58:44 +02:00
748f628993
Bump aws-sdk-s3 from 1.94.1 to 1.95.0 ( #16298 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.94.1 to 1.95.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/commits )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-27 17:55:25 +09:00
602208c65e
Bump nokogiri from 1.11.4 to 1.11.5 ( #16301 )
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.11.4 to 1.11.5.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases )
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md )
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.11.4...v1.11.5 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-27 17:54:58 +09:00
fa1f3e82ec
Bump puma from 5.3.1 to 5.3.2 ( #16302 )
...
Bumps [puma](https://github.com/puma/puma ) from 5.3.1 to 5.3.2.
- [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/v5.3.1...v5.3.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-27 17:54:45 +09:00
28a30fa9f8
Bump sidekiq-unique-jobs from 7.0.10 to 7.0.11 ( #16296 )
...
Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs ) from 7.0.10 to 7.0.11.
- [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/v7.0.10...v7.0.11 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-27 17:48:43 +09:00
61d078bb7e
Bump webpacker from 5.3.0 to 5.4.0 ( #16297 )
...
Bumps [webpacker](https://github.com/rails/webpacker ) from 5.3.0 to 5.4.0.
- [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/v5.3.0...v5.4.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-27 17:48:18 +09:00
f81f50023d
Merge branch 'main' into glitch-soc/merge-upstream
2021-05-22 13:11:31 +02:00
13b0b611f9
Bump simple-navigation from 4.1.0 to 4.3.0 ( #16255 )
...
Bumps [simple-navigation](https://github.com/codeplant/simple-navigation ) from 4.1.0 to 4.3.0.
- [Release notes](https://github.com/codeplant/simple-navigation/releases )
- [Changelog](https://github.com/codeplant/simple-navigation/blob/master/CHANGELOG.md )
- [Commits](https://github.com/codeplant/simple-navigation/commits/v4.3.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-22 00:52:32 +09:00
2e0d8f1356
Bump faker from 2.17.0 to 2.18.0 ( #16259 )
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.17.0 to 2.18.0.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/compare/v2.17.0...v2.18.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-22 00:49:03 +09:00
2b67ba6adb
Bump webmock from 3.12.2 to 3.13.0 ( #16254 )
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.12.2 to 3.13.0.
- [Release notes](https://github.com/bblimke/webmock/releases )
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bblimke/webmock/compare/v3.12.2...v3.13.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-22 00:46:44 +09:00
41679226dc
Bump sidekiq-unique-jobs from 7.0.9 to 7.0.10 ( #16253 )
...
Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs ) from 7.0.9 to 7.0.10.
- [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/v7.0.9...v7.0.10 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-22 00:46:30 +09:00
397c2e5332
Merge branch 'main' into glitch-soc/merge-upstream
2021-05-18 09:40:17 +02:00
ca4e2a3173
Bump nokogiri from 1.11.3 to 1.11.4 ( #16252 )
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.11.3 to 1.11.4.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases )
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md )
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.11.3...v1.11.4 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-17 22:36:44 +02:00
670550a479
Bump puma from 5.3.0 to 5.3.1 ( #16257 )
...
Bumps [puma](https://github.com/puma/puma ) from 5.3.0 to 5.3.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/v5.3.0...v5.3.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-17 22:36:29 +02:00
410b1c28b3
Merge branch 'main' into glitch-soc/merge-upstream
2021-05-10 21:45:32 +02:00
566621a15a
Bump brakeman from 5.0.0 to 5.0.1 ( #16146 )
...
Bumps [brakeman](https://github.com/presidentbeef/brakeman ) from 5.0.0 to 5.0.1.
- [Release notes](https://github.com/presidentbeef/brakeman/releases )
- [Changelog](https://github.com/presidentbeef/brakeman/blob/main/CHANGES.md )
- [Commits](https://github.com/presidentbeef/brakeman/compare/v5.0.0...v5.0.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-10 17:46:39 +02:00
07bb5a6484
Bump rubocop from 1.13.0 to 1.14.0 ( #16192 )
...
Bumps [rubocop](https://github.com/rubocop/rubocop ) from 1.13.0 to 1.14.0.
- [Release notes](https://github.com/rubocop/rubocop/releases )
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop/rubocop/compare/v1.13.0...v1.14.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-10 17:41:37 +02:00
775b60f674
Bump rqrcode from 1.2.0 to 2.0.0 ( #16198 )
...
Bumps [rqrcode](https://github.com/whomwah/rqrcode ) from 1.2.0 to 2.0.0.
- [Release notes](https://github.com/whomwah/rqrcode/releases )
- [Changelog](https://github.com/whomwah/rqrcode/blob/master/CHANGELOG.md )
- [Commits](https://github.com/whomwah/rqrcode/compare/v1.2.0...v2.0.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-10 17:36:14 +02:00
14f8523445
Bump stackprof from 0.2.16 to 0.2.17 ( #16197 )
...
Bumps [stackprof](https://github.com/tmm1/stackprof ) from 0.2.16 to 0.2.17.
- [Release notes](https://github.com/tmm1/stackprof/releases )
- [Changelog](https://github.com/tmm1/stackprof/blob/master/CHANGELOG.md )
- [Commits](https://github.com/tmm1/stackprof/compare/v0.2.16...v0.2.17 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-10 17:35:31 +02:00
7f0714ca0e
Bump rubocop-rails from 2.9.1 to 2.10.1 ( #16193 )
...
Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails ) from 2.9.1 to 2.10.1.
- [Release notes](https://github.com/rubocop/rubocop-rails/releases )
- [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.9.1...v2.10.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-10 17:35:24 +02:00
4a5ab36c23
Bump aws-sdk-s3 from 1.94.0 to 1.94.1 ( #16191 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.94.0 to 1.94.1.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/commits )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-10 17:35:09 +02:00
22f6be6802
Bump puma from 5.2.2 to 5.3.0 ( #16194 )
...
Bumps [puma](https://github.com/puma/puma ) from 5.2.2 to 5.3.0.
- [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/v5.2.2...v5.3.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-10 17:27:50 +02:00
3d8d332bfb
Bump rails from 6.1.3.1 to 6.1.3.2 ( #16196 )
...
Bumps [rails](https://github.com/rails/rails ) from 6.1.3.1 to 6.1.3.2.
- [Release notes](https://github.com/rails/rails/releases )
- [Commits](https://github.com/rails/rails/compare/v6.1.3.1...v6.1.3.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-10 17:25:36 +02:00
31b8010045
Merge branch 'main' into glitch-soc/merge-upstream
...
- `app/views/statuses/_simple_status.html.haml`:
Small markup change in glitch-soc, on a line that has been modified by
upstream. Ported upstream changes.
2021-05-07 18:21:59 +02:00
a8589162c3
Bump webpacker from 5.2.1 to 5.3.0 ( #16144 )
...
Bumps [webpacker](https://github.com/rails/webpacker ) from 5.2.1 to 5.3.0.
- [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/v5.2.1...v5.3.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-07 12:33:21 +09:00
63ffe4bdcd
Bump devise from 4.7.3 to 4.8.0 ( #16140 )
...
Bumps [devise](https://github.com/plataformatec/devise ) from 4.7.3 to 4.8.0.
- [Release notes](https://github.com/plataformatec/devise/releases )
- [Changelog](https://github.com/heartcombo/devise/blob/master/CHANGELOG.md )
- [Commits](https://github.com/plataformatec/devise/compare/v4.7.3...v4.8.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-07 12:27:58 +09:00
86f5fad111
Add Ruby 3.0 support ( #16046 )
...
* Fix issues with POSIX::Spawn, Terrapin and Ruby 3.0
Also improve the Terrapin monkey-patch for the stderr/stdout issue.
* Fix keyword argument handling throughout the codebase
* Monkey-patch Paperclip to fix keyword arguments handling in validators
* Change validation_extensions to please CodeClimate
* Bump microformats from 4.2.1 to 4.3.1
* Allow Ruby 3.0
* Add Ruby 3.0 test target to CircleCI
* Add test for admin dashboard warnings
* Fix admin dashboard warnings on Ruby 3.0
2021-05-06 14:22:54 +02:00
1c2b085a64
Fix media processing getting stuck on too much stdin/stderr ( #16136 )
...
* Fix media processing getting stuck on too much stdin/stderr
See thoughtbot/terrapin#5
* Remove dependency on paperclip-av-transcoder gem
* Remove dependency on streamio-ffmpeg gem
* Disable stdin on ffmpeg process
2021-05-05 19:44:01 +02:00
bc520bd10d
Workaround Resolv::DNS-induced hangs by installing resolv 0.1.0 ( #16157 )
...
See https://github.com/tootsuite/mastodon/pull/16154#issuecomment-832062139
2021-05-05 15:59:43 +02:00
52565cb90d
Bump aws-sdk-s3 from 1.93.1 to 1.94.0 ( #16143 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.93.1 to 1.94.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/commits )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-03 20:12:02 +09:00
bd25847508
Bump sidekiq-unique-jobs from 7.0.8 to 7.0.9 ( #16139 )
...
Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs ) from 7.0.8 to 7.0.9.
- [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/v7.0.8...v7.0.9 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-03 20:05:59 +09:00
c06330953c
Bump rubocop from 1.12.1 to 1.13.0 ( #16115 )
...
Bumps [rubocop](https://github.com/rubocop/rubocop ) from 1.12.1 to 1.13.0.
- [Release notes](https://github.com/rubocop/rubocop/releases )
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop/rubocop/compare/v1.12.1...v1.13.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-04-26 21:47:17 +09:00
f5a9971cac
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream updated copyright year, we don't mention it so kept our version.
- `app/controllers/admin/dashboard_controller.rb`:
Not really a conflict, upstream change (removing the spam checker) too close
to glitch-soc changes. Ported upstream changes.
- `app/models/form/admin_settings.rb`:
Same.
- `app/services/remove_status_service.rb`:
Same.
- `app/views/admin/settings/edit.html.haml`:
Same.
- `config/settings.yml`:
Same.
- `config/environments/production.rb`:
Not a real conflict, upstream added a default HTTP header, but we have
extra headers in glitch-soc.
Added the header.
2021-04-20 12:17:14 +02:00
1ca7b7c28f
Bump aws-sdk-s3 from 1.93.0 to 1.93.1 ( #16071 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.93.0 to 1.93.1.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/commits )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-04-19 21:06:49 +02:00
d2ff043516
Bump tty-prompt from 0.23.0 to 0.23.1 ( #16066 )
...
Bumps [tty-prompt](https://github.com/piotrmurach/tty-prompt ) from 0.23.0 to 0.23.1.
- [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.23.0...v0.23.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-04-19 15:34:09 +02:00
7bd8f2abd4
Bump cld3 from 3.4.1 to 3.4.2 ( #16069 )
...
Bumps [cld3](https://github.com/akihikodaki/cld3-ruby ) from 3.4.1 to 3.4.2.
- [Release notes](https://github.com/akihikodaki/cld3-ruby/releases )
- [Commits](https://github.com/akihikodaki/cld3-ruby/compare/v3.4.1...v3.4.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-04-19 15:33:41 +02:00
9690bfd212
Bump oj from 3.11.3 to 3.11.5 ( #16068 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.11.3 to 3.11.5.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.11.3...v3.11.5 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-04-19 15:33:21 +02:00
a0d856f5a0
Bump connection_pool from 2.2.3 to 2.2.5 ( #16062 )
...
Bumps [connection_pool](https://github.com/mperham/connection_pool ) from 2.2.3 to 2.2.5.
- [Release notes](https://github.com/mperham/connection_pool/releases )
- [Changelog](https://github.com/mperham/connection_pool/blob/master/Changes.md )
- [Commits](https://github.com/mperham/connection_pool/compare/v2.2.3...v2.2.5 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-04-19 15:32:42 +02:00
ac2f9edf45
Bump sidekiq-unique-jobs from 7.0.7 to 7.0.8 ( #16064 )
...
Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs ) from 7.0.7 to 7.0.8.
- [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/v7.0.7...v7.0.8 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-04-19 15:32:19 +02:00
a13ac60bc9
Bump nsa from git to 0.2.8 ( #16033 )
2021-04-13 03:45:45 +02:00
dcb4bbc590
Bump parallel_tests from 3.6.0 to 3.7.0 ( #16024 )
...
Bumps [parallel_tests](https://github.com/grosser/parallel_tests ) from 3.6.0 to 3.7.0.
- [Release notes](https://github.com/grosser/parallel_tests/releases )
- [Changelog](https://github.com/grosser/parallel_tests/blob/master/CHANGELOG.md )
- [Commits](https://github.com/grosser/parallel_tests/compare/v3.6.0...v3.7.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-04-12 14:37:29 +02:00
a8bf951926
Change Web Push API deliveries to use request pooling ( #16014 )
2021-04-12 14:25:34 +02:00
70bea95155
Bump pkg-config from 1.4.5 to 1.4.6 ( #16019 )
...
Bumps [pkg-config](https://github.com/ruby-gnome/pkg-config ) from 1.4.5 to 1.4.6.
- [Release notes](https://github.com/ruby-gnome/pkg-config/releases )
- [Changelog](https://github.com/ruby-gnome/pkg-config/blob/master/NEWS )
- [Commits](https://github.com/ruby-gnome/pkg-config/compare/1.4.5...1.4.6 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-04-12 14:08:06 +02:00
c2c5daf747
Bump doorkeeper from 5.5.0 to 5.5.1 ( #16016 )
...
Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper ) from 5.5.0 to 5.5.1.
- [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases )
- [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/main/CHANGELOG.md )
- [Commits](https://github.com/doorkeeper-gem/doorkeeper/compare/v5.5.0...v5.5.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-04-12 14:00:55 +02:00
7e009bc8b9
Bump nokogiri from 1.11.2 to 1.11.3 ( #16017 )
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.11.2 to 1.11.3.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases )
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md )
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.11.2...v1.11.3 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-04-12 14:00:30 +02:00
9054c7676a
Bump sidekiq from 6.2.0 to 6.2.1 ( #16026 )
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 6.2.0 to 6.2.1.
- [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/v6.2.0...v6.2.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-04-12 14:00:06 +02:00
b0ba97e1c1
Remove dependency on pluck_each gem ( #16012 )
2021-04-12 03:35:58 +02:00
2e8a673376
Remove spam check and dependency on nilsimsa gem ( #16011 )
2021-04-11 11:22:50 +02:00
8ac9365dae
Bump devise-two-factor from git to 4.0.0 ( #15987 )
2021-04-10 11:50:41 +02:00
acd8edcdee
Upgrade Ruby to 2.7.3 ( #16004 )
...
* Upgrade Ruby to 2.7.3
https://www.ruby-lang.org/en/news/2021/04/05/ruby-2-7-3-released/
includes security fixes to
- CVE-2021-28965: XML round-trip vulnerability in REXML
- CVE-2021-28966: Path traversal in Tempfile on Windows
* Update rexml to 3.2.5
https://www.ruby-lang.org/en/news/2021/04/05/xml-round-trip-vulnerability-in-rexml-cve-2021-28965/
2021-04-09 02:31:36 +02:00
ba9921c644
Merge branch 'main' into glitch-soc/merge-upstream
2021-04-05 14:31:07 +02:00
4da28621ef
Bump rubocop from 1.12.0 to 1.12.1 ( #15996 )
...
Bumps [rubocop](https://github.com/rubocop/rubocop ) from 1.12.0 to 1.12.1.
- [Release notes](https://github.com/rubocop/rubocop/releases )
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop/rubocop/compare/v1.12.0...v1.12.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-04-05 19:10:40 +09:00
2e0cdf30d5
Change health check ( #15988 )
2021-04-03 02:39:04 +02:00
88048a8d8a
Merge branch 'main' into glitch-soc/merge-upstream
2021-03-31 10:34:29 +02:00
de6d254cdb
Bump aws-sdk-s3 from 1.92.0 to 1.93.0 ( #15973 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.92.0 to 1.93.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/commits )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-03-30 23:58:23 +09:00
28a07f63bf
Bump rubocop from 1.11.0 to 1.12.0 ( #15970 )
...
Bumps [rubocop](https://github.com/rubocop/rubocop ) from 1.11.0 to 1.12.0.
- [Release notes](https://github.com/rubocop/rubocop/releases )
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop/rubocop/compare/v1.11.0...v1.12.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-03-30 23:49:45 +09:00
4db6679d78
Bump parallel_tests from 3.5.2 to 3.6.0 ( #15968 )
...
Bumps [parallel_tests](https://github.com/grosser/parallel_tests ) from 3.5.2 to 3.6.0.
- [Release notes](https://github.com/grosser/parallel_tests/releases )
- [Changelog](https://github.com/grosser/parallel_tests/blob/master/CHANGELOG.md )
- [Commits](https://github.com/grosser/parallel_tests/compare/v3.5.2...v3.6.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-03-30 23:48:30 +09:00
1973ee7976
Bump fabrication from 2.21.1 to 2.22.0 ( #15966 )
...
Bumps [fabrication](https://github.com/paulelliott/fabrication ) from 2.21.1 to 2.22.0.
- [Release notes](https://github.com/paulelliott/fabrication/releases )
- [Changelog](https://github.com/paulelliott/fabrication/blob/master/Changelog.markdown )
- [Commits](https://github.com/paulelliott/fabrication/commits )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-03-30 23:47:06 +09:00
d40cd3501e
Bump webmock from 3.12.1 to 3.12.2 ( #15964 )
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.12.1 to 3.12.2.
- [Release notes](https://github.com/bblimke/webmock/releases )
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bblimke/webmock/compare/v3.12.1...v3.12.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-03-30 23:44:51 +09:00
0adfb79dd9
Bump pghero from 2.8.0 to 2.8.1 ( #15962 )
...
Bumps [pghero](https://github.com/ankane/pghero ) from 2.8.0 to 2.8.1.
- [Release notes](https://github.com/ankane/pghero/releases )
- [Changelog](https://github.com/ankane/pghero/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ankane/pghero/compare/v2.8.0...v2.8.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-03-29 15:17:10 +02:00
34cc6d6cc7
Bump rails from 6.1.3 to 6.1.3.1 ( #15960 )
...
Bumps [rails](https://github.com/rails/rails ) from 6.1.3 to 6.1.3.1.
- [Release notes](https://github.com/rails/rails/releases )
- [Commits](https://github.com/rails/rails/compare/v6.1.3...v6.1.3.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-03-29 14:39:37 +09:00
d10b08ea1f
Merge branch 'main' into glitch-soc/merge-upstream
2021-03-24 10:53:50 +01:00
5119cd8a0b
Bump brakeman from 4.10.1 to 5.0.0 ( #15656 )
...
Bumps [brakeman](https://github.com/presidentbeef/brakeman ) from 4.10.1 to 5.0.0.
- [Release notes](https://github.com/presidentbeef/brakeman/releases )
- [Changelog](https://github.com/presidentbeef/brakeman/blob/main/CHANGES.md )
- [Commits](https://github.com/presidentbeef/brakeman/compare/v4.10.1...v5.0.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-03-24 10:53:23 +01:00
b2a89bf38e
Update Mastodon to Rails 6.1 ( #15910 )
...
* Update devise-two-factor to unreleased fork for Rails 6 support
Update tests to match new `rotp` version.
* Update nsa gem to unreleased fork for Rails 6 support
* Update rails to 6.1.3 and rails-i18n to 6.0
* Update to unreleased fork of pluck_each for Ruby 6 support
* Run "rails app:update"
* Add missing ActiveStorage config file
* Use config.ssl_options instead of removed ApplicationController#force_ssl
Disabled force_ssl-related tests as they do not seem to be easily testable
anymore.
* Fix nonce directives by removing Rails 5 specific monkey-patching
* Fix fixture_file_upload deprecation warning
* Fix yield-based test failing with Rails 6
* Use Rails 6's index_with when possible
* Use ActiveRecord::Cache::Store#delete_multi from Rails 6
This will yield better performances when deleting an account
* Disable Rails 6.1's automatic preload link headers
Since Rails 6.1, ActionView adds preload links for javascript files
in the Links header per default.
In our case, that will bloat headers too much and potentially cause
issues with reverse proxies. Furhermore, we don't need those links,
as we already output them as HTML link tags.
* Switch to Rails 6.0 default config
* Switch to Rails 6.1 default config
* Do not include autoload paths in the load path
2021-03-24 10:44:31 +01:00
22763902bf
Bump aws-sdk-s3 from 1.91.0 to 1.92.0 ( #15938 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.91.0 to 1.92.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/commits )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-03-22 07:39:39 +01:00
e02c954ed2
Bump rspec-rails from 5.0.0 to 5.0.1 ( #15939 )
...
Bumps [rspec-rails](https://github.com/rspec/rspec-rails ) from 5.0.0 to 5.0.1.
- [Release notes](https://github.com/rspec/rspec-rails/releases )
- [Changelog](https://github.com/rspec/rspec-rails/blob/main/Changelog.md )
- [Commits](https://github.com/rspec/rspec-rails/compare/v5.0.0...v5.0.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-03-22 07:38:54 +01:00
f2916a3098
Bump ox from 2.14.3 to 2.14.4 ( #15941 )
...
Bumps [ox](https://github.com/ohler55/ox ) from 2.14.3 to 2.14.4.
- [Release notes](https://github.com/ohler55/ox/releases )
- [Changelog](https://github.com/ohler55/ox/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/ohler55/ox/compare/v2.14.3...v2.14.4 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-03-22 07:38:23 +01:00
96e3599dbb
Bump sidekiq from 6.1.3 to 6.2.0 ( #15943 )
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 6.1.3 to 6.2.0.
- [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/v6.1.3...v6.2.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-03-22 07:37:51 +01:00
a97c88abc5
Bump blurhash from 0.1.4 to 0.1.5 ( #15942 )
...
Bumps [blurhash](https://github.com/Gargron/blurhash ) from 0.1.4 to 0.1.5.
- [Release notes](https://github.com/Gargron/blurhash/releases )
- [Commits](https://github.com/Gargron/blurhash/commits/v0.1.5 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-03-22 07:36:13 +01:00
ee0c66df1e
Bump sidekiq-unique-jobs from 7.0.4 to 7.0.7 ( #15944 )
...
Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs ) from 7.0.4 to 7.0.7.
- [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/v7.0.4...v7.0.7 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-03-22 07:35:46 +01:00
e19ca0e913
Merge branch 'main' into glitch-soc/merge-upstream
2021-03-19 13:57:15 +01:00
1634e71bd6
Prepare Mastodon for Rails 6 ( #15911 )
...
* Fix misuse of foreign_type
* Fix use of removed "add_template_helper"
* Use response.media_type instead of response.content_type in tests
* Fix CSV export controller test on Rails 6
Rails 6 sets a "filename*" field in the Content-Disposition header to
explicitly encode the filename as UTF-8.
This changes checks the first part of the Content-Disposition header so
it matches in both Rails 5 and Rails 6.
* Fix emoji formatting with Rails 6
* Make emoji output more idiomatic and robust
* Switch from redis-rails gem to built-in Rails redis cache storage
2021-03-17 10:09:55 +01:00
d0fbc2d04c
Bump rspec-rails from 4.1.0 to 5.0.0 ( #15876 )
...
Bumps [rspec-rails](https://github.com/rspec/rspec-rails ) from 4.1.0 to 5.0.0.
- [Release notes](https://github.com/rspec/rspec-rails/releases )
- [Changelog](https://github.com/rspec/rspec-rails/blob/main/Changelog.md )
- [Commits](https://github.com/rspec/rspec-rails/compare/v4.1.0...v5.0.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-03-16 07:55:43 +09:00
a6b92df04f
Bump bundler-audit from 0.7.0.1 to 0.8.0 ( #15877 )
...
Bumps [bundler-audit](https://github.com/postmodern/bundler-audit ) from 0.7.0.1 to 0.8.0.
- [Release notes](https://github.com/postmodern/bundler-audit/releases )
- [Changelog](https://github.com/rubysec/bundler-audit/blob/master/ChangeLog.md )
- [Commits](https://github.com/postmodern/bundler-audit/compare/v0.7.0.1...v0.8.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-03-15 21:19:16 +09:00
3c09518a1d
Merge branch 'main' into glitch-soc/merge-upstream
2021-03-15 11:26:59 +01:00
335e7f37a4
Bump pghero from 2.7.4 to 2.8.0 ( #15907 )
...
Bumps [pghero](https://github.com/ankane/pghero ) from 2.7.4 to 2.8.0.
- [Release notes](https://github.com/ankane/pghero/releases )
- [Changelog](https://github.com/ankane/pghero/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ankane/pghero/compare/v2.7.4...v2.8.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-03-15 08:09:47 +01:00
5e563b4f2f
Bump json-ld-preloaded from 3.1.4 to 3.1.5 ( #15880 )
...
Bumps [json-ld-preloaded](https://github.com/ruby-rdf/json-ld-preloaded ) from 3.1.4 to 3.1.5.
- [Release notes](https://github.com/ruby-rdf/json-ld-preloaded/releases )
- [Commits](https://github.com/ruby-rdf/json-ld-preloaded/compare/3.1.4...3.1.5 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-03-13 09:04:13 +09:00
c35fa4338e
Bump oj from 3.11.2 to 3.11.3 ( #15874 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.11.2 to 3.11.3.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.11.2...v3.11.3 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-03-12 23:06:29 +09:00
d70513a7de
Bump nokogiri from 1.11.1 to 1.11.2 ( #15881 )
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.11.1 to 1.11.2.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases )
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md )
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.11.1...v1.11.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-03-12 22:55:06 +09:00
67b904ba2e
Bump parallel_tests from 3.5.1 to 3.5.2 ( #15882 )
...
Bumps [parallel_tests](https://github.com/grosser/parallel_tests ) from 3.5.1 to 3.5.2.
- [Release notes](https://github.com/grosser/parallel_tests/releases )
- [Changelog](https://github.com/grosser/parallel_tests/blob/master/CHANGELOG.md )
- [Commits](https://github.com/grosser/parallel_tests/compare/v3.5.1...v3.5.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-03-12 22:11:26 +09:00
3356e2a4e4
Bump ox from 2.14.2 to 2.14.3 ( #15875 )
...
Bumps [ox](https://github.com/ohler55/ox ) from 2.14.2 to 2.14.3.
- [Release notes](https://github.com/ohler55/ox/releases )
- [Changelog](https://github.com/ohler55/ox/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/ohler55/ox/compare/v2.14.2...v2.14.3 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-03-12 22:11:05 +09:00
266a038fac
Bump aws-sdk-s3 from 1.89.0 to 1.91.0 ( #15879 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.89.0 to 1.91.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/commits )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-03-12 16:56:43 +09:00
dd7e9318c9
Bump sidekiq-unique-jobs from 6.0.25 to 7.0.4 ( #15878 )
...
Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs ) from 6.0.25 to 7.0.4.
- [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.25...v7.0.4 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-03-12 16:55:32 +09:00
b47b75536e
Bump faker from 2.16.0 to 2.17.0 ( #15873 )
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.16.0 to 2.17.0.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/compare/v2.16.0...v2.17.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-03-12 15:21:05 +09:00
182f2661fc
Bump sidekiq-unique-jobs from 6.0.25 to 7.0.1 ( #15627 )
...
* Bump sidekiq-unique-jobs from 6.0.25 to 7.0.1
Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs ) from 6.0.25 to 7.0.1.
- [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.25...v7.0.1 )
Signed-off-by: dependabot[bot] <support@github.com>
* Fix migration being broken by sidekiq-unique-jobs update
* Fix migration script following API changes in dependency
* Fixup
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: ThibG <thib@sitedethib.com>
2021-03-12 05:39:58 +01:00
01c5964bf3
Bump rubocop from 1.9.1 to 1.11.0 ( #15820 )
...
Bumps [rubocop](https://github.com/rubocop/rubocop ) from 1.9.1 to 1.11.0.
- [Release notes](https://github.com/rubocop/rubocop/releases )
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop/rubocop/compare/v1.9.1...v1.11.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-03-12 05:38:44 +01:00
cf6d132a58
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/validators/status_length_validator.rb`:
Conflict due to glitch-soc's configurable maximum toot chars.
Ported upstream changes.
2021-03-11 16:08:15 +01:00
dcb2266d34
Bump rspec-rails from 4.0.2 to 4.1.0 ( #15852 )
...
Bumps [rspec-rails](https://github.com/rspec/rspec-rails ) from 4.0.2 to 4.1.0.
- [Release notes](https://github.com/rspec/rspec-rails/releases )
- [Changelog](https://github.com/rspec/rspec-rails/blob/main/Changelog.md )
- [Commits](https://github.com/rspec/rspec-rails/compare/v4.0.2...v4.1.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-03-08 23:05:35 +09:00
2cbd454ead
Bump ox from 2.14.1 to 2.14.2 ( #15854 )
...
Bumps [ox](https://github.com/ohler55/ox ) from 2.14.1 to 2.14.2.
- [Release notes](https://github.com/ohler55/ox/releases )
- [Changelog](https://github.com/ohler55/ox/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/ohler55/ox/compare/v2.14.1...v2.14.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-03-08 22:50:51 +09:00
e842a5aeb1
Bump parallel_tests from 3.5.0 to 3.5.1 ( #15853 )
...
Bumps [parallel_tests](https://github.com/grosser/parallel_tests ) from 3.5.0 to 3.5.1.
- [Release notes](https://github.com/grosser/parallel_tests/releases )
- [Changelog](https://github.com/grosser/parallel_tests/blob/master/CHANGELOG.md )
- [Commits](https://github.com/grosser/parallel_tests/compare/v3.5.0...v3.5.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-03-08 22:50:39 +09:00
2b756b5907
Bump webmock from 3.12.0 to 3.12.1 ( #15851 )
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.12.0 to 3.12.1.
- [Release notes](https://github.com/bblimke/webmock/releases )
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bblimke/webmock/compare/v3.12.0...v3.12.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-03-08 22:50:13 +09:00
b3a73b1a93
Bump redcarpet from 3.5.0 to 3.5.1
...
Bumps [redcarpet](https://github.com/vmg/redcarpet ) from 3.5.0 to 3.5.1.
- [Release notes](https://github.com/vmg/redcarpet/releases )
- [Changelog](https://github.com/vmg/redcarpet/blob/master/CHANGELOG.md )
- [Commits](https://github.com/vmg/redcarpet/compare/v3.5.0...v3.5.1 )
Signed-off-by: dependabot[bot] <support@github.com>
2021-03-06 14:51:45 +01:00
9ed4653ff3
Bump puma from 5.2.1 to 5.2.2 ( #15836 )
...
Bumps [puma](https://github.com/puma/puma ) from 5.2.1 to 5.2.2.
- [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/v5.2.1...v5.2.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-03-05 12:32:37 +09:00
3aae232a73
Bump i18n-tasks from 0.9.33 to 0.9.34 ( #15834 )
...
Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks ) from 0.9.33 to 0.9.34.
- [Release notes](https://github.com/glebm/i18n-tasks/releases )
- [Changelog](https://github.com/glebm/i18n-tasks/blob/main/CHANGES.md )
- [Commits](https://github.com/glebm/i18n-tasks/compare/v0.9.33...v0.9.34 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-03-05 12:00:23 +09:00
845a4db486
Bump parallel_tests from 3.4.0 to 3.5.0 ( #15813 )
...
Bumps [parallel_tests](https://github.com/grosser/parallel_tests ) from 3.4.0 to 3.5.0.
- [Release notes](https://github.com/grosser/parallel_tests/releases )
- [Changelog](https://github.com/grosser/parallel_tests/blob/master/CHANGELOG.md )
- [Commits](https://github.com/grosser/parallel_tests/compare/v3.4.0...v3.5.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-03-05 06:39:46 +09:00
b999d1608c
Bump capistrano from 3.15.0 to 3.16.0 ( #15818 )
...
* Bump capistrano from 3.15.0 to 3.16.0
Bumps [capistrano](https://github.com/capistrano/capistrano ) from 3.15.0 to 3.16.0.
- [Release notes](https://github.com/capistrano/capistrano/releases )
- [Commits](https://github.com/capistrano/capistrano/compare/v3.15.0...v3.16.0 )
Signed-off-by: dependabot[bot] <support@github.com>
* 3.16
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2021-03-05 06:38:52 +09:00
5a89279d20
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/validators/status_length_validator.rb`:
Upstream changes too close to glitch-soc MAX_CHARS changes, but not a real
conflict.
Applied upstream changes.
- `package.json`:
glitch-soc-only dependency textually too close to a dependency updated
upstream, not a real conflict.
Applied upstream changes.
2021-03-02 12:06:58 +01:00
a33f8f787a
Update twitter-text from 1.14 to 3.1.0 and fix toot character counting ( #15382 )
...
* Update twitter-text from 1.14 to 3.1.0
* Disable emoji parsing
* Properly depend on twitter-text for url detection
* Fix some URLs being wrongly detected client-side
* Add test for server-side validation of non-autolinkable URLs
* Fix server-side status length counting
2021-03-02 12:02:56 +01:00
78673f5d82
Bump json-ld from 3.1.8 to 3.1.9 ( #15812 )
...
Bumps [json-ld](https://github.com/ruby-rdf/json-ld ) from 3.1.8 to 3.1.9.
- [Release notes](https://github.com/ruby-rdf/json-ld/releases )
- [Commits](https://github.com/ruby-rdf/json-ld/compare/3.1.8...3.1.9 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-03-01 23:50:00 +09:00
29224d6a6d
Bump fastimage from 2.2.2 to 2.2.3 ( #15819 )
...
Bumps [fastimage](https://github.com/sdsykes/fastimage ) from 2.2.2 to 2.2.3.
- [Release notes](https://github.com/sdsykes/fastimage/releases )
- [Commits](https://github.com/sdsykes/fastimage/compare/v2.2.2...v2.2.3 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-03-01 23:37:06 +09:00
01a55c8aeb
Bump webmock from 3.11.2 to 3.12.0 ( #15817 )
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.11.2 to 3.12.0.
- [Release notes](https://github.com/bblimke/webmock/releases )
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bblimke/webmock/compare/v3.11.2...v3.12.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-03-01 23:36:45 +09:00
a5900f49b0
Bump aws-sdk-s3 from 1.88.1 to 1.89.0 ( #15814 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.88.1 to 1.89.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/commits )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-03-01 23:35:00 +09:00
29863439dc
Bump bullet from 6.1.3 to 6.1.4 ( #15815 )
...
Bumps [bullet](https://github.com/flyerhzm/bullet ) from 6.1.3 to 6.1.4.
- [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/6.1.3...6.1.4 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-03-01 23:34:29 +09:00
354fc27de1
Bump doorkeeper from 5.4.0 to 5.5.0 ( #15757 )
...
Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper ) from 5.4.0 to 5.5.0.
- [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases )
- [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/main/CHANGELOG.md )
- [Commits](https://github.com/doorkeeper-gem/doorkeeper/compare/v5.4.0...v5.5.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-24 06:58:39 +09:00
dd60ecfc04
Merge branch 'main' into glitch-soc/merge-upstream
2021-02-22 15:23:46 +01:00
a74d700799
Bump rails from 5.2.4.4 to 5.2.4.5 ( #15729 )
...
Bumps [rails](https://github.com/rails/rails ) from 5.2.4.4 to 5.2.4.5.
- [Release notes](https://github.com/rails/rails/releases )
- [Commits](https://github.com/rails/rails/compare/v5.2.4.4...v5.2.4.5 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-20 21:38:05 +09:00
ea4593948f
Bump puma from 5.1.1 to 5.2.1 ( #15670 )
...
Bumps [puma](https://github.com/puma/puma ) from 5.1.1 to 5.2.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/v5.1.1...v5.2.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-20 15:55:12 +09:00
01531c9a5b
Bump simple_form from 5.0.3 to 5.1.0 ( #15732 )
...
Bumps [simple_form](https://github.com/plataformatec/simple_form ) from 5.0.3 to 5.1.0.
- [Release notes](https://github.com/plataformatec/simple_form/releases )
- [Changelog](https://github.com/heartcombo/simple_form/blob/master/CHANGELOG.md )
- [Commits](https://github.com/plataformatec/simple_form/compare/v5.0.3...v5.1.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-19 18:09:30 +09:00
e4b4305c58
Bump faker from 2.15.1 to 2.16.0 ( #15735 )
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.15.1 to 2.16.0.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/compare/v2.15.1...v2.16.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-19 18:08:09 +09:00
b392126575
Bump aws-sdk-s3 from 1.88.0 to 1.88.1 ( #15730 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.88.0 to 1.88.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/commits )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-19 18:07:40 +09:00
489a5a539c
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/styles/mastodon/modal.scss`:
For some reason we changed the file loading path in glitch-soc,
but now upstream has completely changed how the logo is loaded.
Applied upstream changes.
2021-02-12 10:28:32 +01:00
e47570388a
Drop dependency on secure_headers, fix response headers ( #15712 )
...
* Drop dependency on secure_headers, use always_write_cookie instead
* Fix cookies in Tor Hidden Services by moving configuration to application.rb
* Instead of setting always_write_cookie at boot, monkey-patch ActionDispatch
2021-02-11 23:47:05 +01:00
649b483c64
Downgrade bootsnap to 1.6.0 ( #15711 )
...
* Revert "Bump bootsnap from 1.5.1 to 1.7.1 (#15669 )"
This reverts commit 3a425520d1
2021-02-11 19:20:58 +01:00
d40bfd255a
Bump rubocop from 1.8.1 to 1.9.1 ( #15677 )
...
* Bump rubocop from 1.8.1 to 1.9.1
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 1.8.1 to 1.9.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/v1.8.1...v1.9.1 )
Signed-off-by: dependabot[bot] <support@github.com>
* Fix .codeclimate.yml
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2021-02-12 00:10:00 +09:00
aff85a4ff3
Bump rack-attack from 6.4.0 to 6.5.0 ( #15671 )
...
Bumps [rack-attack](https://github.com/rack/rack-attack ) from 6.4.0 to 6.5.0.
- [Release notes](https://github.com/rack/rack-attack/releases )
- [Changelog](https://github.com/rack/rack-attack/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rack/rack-attack/compare/v6.4.0...v6.5.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-11 20:58:46 +09:00
2a81d399c0
Bump redis-namespace from 1.8.0 to 1.8.1 ( #15676 )
...
Bumps [redis-namespace](https://github.com/resque/redis-namespace ) from 1.8.0 to 1.8.1.
- [Release notes](https://github.com/resque/redis-namespace/releases )
- [Changelog](https://github.com/resque/redis-namespace/blob/master/CHANGELOG.md )
- [Commits](https://github.com/resque/redis-namespace/compare/v1.8.0...v1.8.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-11 20:54:19 +09:00
1927d4bfc2
Bump json-ld from 3.1.7 to 3.1.8 ( #15674 )
...
Bumps [json-ld](https://github.com/ruby-rdf/json-ld ) from 3.1.7 to 3.1.8.
- [Release notes](https://github.com/ruby-rdf/json-ld/releases )
- [Commits](https://github.com/ruby-rdf/json-ld/compare/3.1.7...3.1.8 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-11 20:53:53 +09:00
0ad54c129d
Bump pkg-config from 1.4.4 to 1.4.5 ( #15672 )
...
Bumps [pkg-config](https://github.com/ruby-gnome/pkg-config ) from 1.4.4 to 1.4.5.
- [Release notes](https://github.com/ruby-gnome/pkg-config/releases )
- [Changelog](https://github.com/ruby-gnome/pkg-config/blob/master/NEWS )
- [Commits](https://github.com/ruby-gnome/pkg-config/compare/1.4.4...1.4.5 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-11 20:53:02 +09:00
3a425520d1
Bump bootsnap from 1.5.1 to 1.7.1 ( #15669 )
...
Bumps [bootsnap](https://github.com/Shopify/bootsnap ) from 1.5.1 to 1.7.1.
- [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.5.1...v1.7.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-11 20:51:09 +09:00
6c300f08e5
Onion service related changes to HTTPS handling ( #15560 )
...
* Enable secure cookie flag for https only
* Disable force_ssl for .onion hosts only
Co-authored-by: Aiden McClelland <me@drbonez.dev>
2021-02-11 04:40:13 +01:00
00bb9281ba
Bump pghero from 2.7.3 to 2.7.4 ( #15668 )
...
Bumps [pghero](https://github.com/ankane/pghero ) from 2.7.3 to 2.7.4.
- [Release notes](https://github.com/ankane/pghero/releases )
- [Changelog](https://github.com/ankane/pghero/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ankane/pghero/compare/v2.7.3...v2.7.4 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-10 09:56:11 +09:00
e73c4032e5
Bump aws-sdk-s3 from 1.87.0 to 1.88.0 ( #15667 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.87.0 to 1.88.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/commits )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-10 09:55:51 +09:00
85e0b5ce91
Merge branch 'main' into glitch-soc/merge-upstream
2021-02-03 17:02:48 +01:00
59dbc0d295
Bump oj from 3.11.1 to 3.11.2 ( #15657 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.11.1 to 3.11.2.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.11.1...v3.11.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-03 04:27:57 +09:00
f0c7598222
Bump fastimage from 2.2.1 to 2.2.2 ( #15651 )
...
Bumps [fastimage](https://github.com/sdsykes/fastimage ) from 2.2.1 to 2.2.2.
- [Release notes](https://github.com/sdsykes/fastimage/releases )
- [Commits](https://github.com/sdsykes/fastimage/compare/v2.2.1...v2.2.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-03 04:27:19 +09:00
68d9ee4fb6
Bump webmock from 3.11.1 to 3.11.2 ( #15650 )
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.11.1 to 3.11.2.
- [Release notes](https://github.com/bblimke/webmock/releases )
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bblimke/webmock/compare/v3.11.1...v3.11.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-02 23:56:17 +09:00
333a3c2968
Bump capybara from 3.34.0 to 3.35.3 ( #15649 )
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.34.0 to 3.35.3.
- [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.34.0...3.35.3 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-02 23:47:35 +09:00
04c4c09b1b
Bump chewy from 5.1.0 to 5.2.0 ( #15648 )
...
Bumps [chewy](https://github.com/toptal/chewy ) from 5.1.0 to 5.2.0.
- [Release notes](https://github.com/toptal/chewy/releases )
- [Changelog](https://github.com/toptal/chewy/blob/master/CHANGELOG.md )
- [Commits](https://github.com/toptal/chewy/compare/v5.1.0...v5.2.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-02 23:47:12 +09:00
b391f971c1
Bump rubocop from 1.7.0 to 1.8.1 ( #15573 )
...
* Bump rubocop from 1.7.0 to 1.8.1
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 1.7.0 to 1.8.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/v1.7.0...v1.8.1 )
Signed-off-by: dependabot[bot] <support@github.com>
* Fix .codeclimate.yml
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2021-02-01 03:48:29 +09:00
15b263d847
Bump sidekiq from 6.1.2 to 6.1.3 ( #15621 )
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 6.1.2 to 6.1.3.
- [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/v6.1.2...v6.1.3 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-27 08:58:29 +09:00
6562b5a587
Bump thor from 1.0.1 to 1.1.0 ( #15622 )
...
Bumps [thor](https://github.com/erikhuda/thor ) from 1.0.1 to 1.1.0.
- [Release notes](https://github.com/erikhuda/thor/releases )
- [Changelog](https://github.com/erikhuda/thor/blob/master/CHANGELOG.md )
- [Commits](https://github.com/erikhuda/thor/compare/v1.0.1...v1.1.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-26 23:35:03 +09:00
2b48888530
Bump tzinfo-data from 1.2020.6 to 1.2021.1 ( #15623 )
...
Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data ) from 1.2020.6 to 1.2021.1.
- [Release notes](https://github.com/tzinfo/tzinfo-data/releases )
- [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2020.6...v1.2021.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-26 23:34:48 +09:00
b4f7f0c730
Bump oj from 3.11.0 to 3.11.1 ( #15626 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.11.0 to 3.11.1.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.11.0...v3.11.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-26 23:33:46 +09:00
86d2d2f9df
Bump rack-attack from 6.3.1 to 6.4.0 ( #15628 )
...
Bumps [rack-attack](https://github.com/rack/rack-attack ) from 6.3.1 to 6.4.0.
- [Release notes](https://github.com/rack/rack-attack/releases )
- [Changelog](https://github.com/rack/rack-attack/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rack/rack-attack/compare/v6.3.1...v6.4.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-26 23:33:06 +09:00
f981cbed4a
Bump bullet from 6.1.2 to 6.1.3 ( #15629 )
...
Bumps [bullet](https://github.com/flyerhzm/bullet ) from 6.1.2 to 6.1.3.
- [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/6.1.2...6.1.3 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-26 23:32:42 +09:00
9493606b11
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `CONTRIBUTING.md`:
Not a real conflict, glitch-soc quotes the upstream file, which has been
changed. Update the quote.
2021-01-26 14:01:30 +01:00
6d1f69263c
Bump makara from 0.4.1 to 0.5.0 ( #15578 )
...
Bumps [makara](https://github.com/taskrabbit/makara ) from 0.4.1 to 0.5.0.
- [Release notes](https://github.com/taskrabbit/makara/releases )
- [Changelog](https://github.com/instacart/makara/blob/master/CHANGELOG.md )
- [Commits](https://github.com/taskrabbit/makara/compare/v0.4.1...v0.5.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-23 23:25:08 +09:00
020c4bf2af
Merge branch 'main' into glitch-soc/merge-upstream
2021-01-21 16:51:12 +01:00
05c52690c2
Bump concurrent-ruby from 1.1.7 to 1.1.8 ( #15601 )
...
Bumps [concurrent-ruby](https://github.com/ruby-concurrency/concurrent-ruby ) from 1.1.7 to 1.1.8.
- [Release notes](https://github.com/ruby-concurrency/concurrent-ruby/releases )
- [Changelog](https://github.com/ruby-concurrency/concurrent-ruby/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ruby-concurrency/concurrent-ruby/compare/v1.1.7...v1.1.8 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-21 21:46:37 +09:00
ce2efb9ed0
Bump sanitize from 5.2.2 to 5.2.3 ( #15582 )
...
Bumps [sanitize](https://github.com/rgrove/sanitize ) from 5.2.2 to 5.2.3.
- [Release notes](https://github.com/rgrove/sanitize/releases )
- [Changelog](https://github.com/rgrove/sanitize/blob/master/HISTORY.md )
- [Commits](https://github.com/rgrove/sanitize/compare/v5.2.2...v5.2.3 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-20 21:42:34 +09:00
5ff7adf281
Bump strong_migrations from 0.7.4 to 0.7.6 ( #15581 )
...
Bumps [strong_migrations](https://github.com/ankane/strong_migrations ) from 0.7.4 to 0.7.6.
- [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.7.4...v0.7.6 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-20 21:40:39 +09:00
a2a49c50cb
Bump oj from 3.10.18 to 3.11.0 ( #15583 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.10.18 to 3.11.0.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.10.18...v3.11.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-20 21:30:56 +09:00
8366001e01
Bump ox from 2.14.0 to 2.14.1 ( #15576 )
...
Bumps [ox](https://github.com/ohler55/ox ) from 2.14.0 to 2.14.1.
- [Release notes](https://github.com/ohler55/ox/releases )
- [Changelog](https://github.com/ohler55/ox/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/ohler55/ox/compare/v2.14.0...v2.14.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-20 21:29:29 +09:00
239ce2f1f4
Bump webmock from 3.11.0 to 3.11.1 ( #15570 )
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.11.0 to 3.11.1.
- [Release notes](https://github.com/bblimke/webmock/releases )
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bblimke/webmock/compare/v3.11.0...v3.11.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-20 21:17:59 +09:00
1a9e0432ae
Merge branch 'master' into glitch-soc/merge-upstream
2021-01-18 13:57:12 +01:00
f0e14aa852
Bump capistrano from 3.14.1 to 3.15.0 ( #15537 )
...
* Bump capistrano from 3.14.1 to 3.15.0
Bumps [capistrano](https://github.com/capistrano/capistrano ) from 3.14.1 to 3.15.0.
- [Release notes](https://github.com/capistrano/capistrano/releases )
- [Commits](https://github.com/capistrano/capistrano/compare/v3.14.1...v3.15.0 )
Signed-off-by: dependabot[bot] <support@github.com>
* Fix config/deploy.rb
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2021-01-18 11:10:23 +09:00
4fa68913d3
Bump simplecov from 0.21.0 to 0.21.2 ( #15536 )
...
Bumps [simplecov](https://github.com/simplecov-ruby/simplecov ) from 0.21.0 to 0.21.2.
- [Release notes](https://github.com/simplecov-ruby/simplecov/releases )
- [Changelog](https://github.com/simplecov-ruby/simplecov/blob/main/CHANGELOG.md )
- [Commits](https://github.com/simplecov-ruby/simplecov/compare/v0.21.0...v0.21.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-17 01:06:28 +09:00
3b60a98e9b
Bump sanitize from 5.2.1 to 5.2.2 ( #15538 )
...
Bumps [sanitize](https://github.com/rgrove/sanitize ) from 5.2.1 to 5.2.2.
- [Release notes](https://github.com/rgrove/sanitize/releases )
- [Changelog](https://github.com/rgrove/sanitize/blob/master/HISTORY.md )
- [Commits](https://github.com/rgrove/sanitize/compare/v5.2.1...v5.2.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-17 01:02:51 +09:00
297cfaa3bb
Bump nokogiri from 1.11.0 to 1.11.1 ( #15539 )
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.11.0 to 1.11.1.
- [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.11.0...v1.11.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-17 00:59:43 +09:00
77a975a964
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/public_feed.rb`:
Upstream refactored a bit, glitch-soc had specific code for local-only
statuses.
Updated glitch-soc's specific code accordingly.
2021-01-11 11:55:42 +01:00
c31a08a6a3
Bump binding_of_caller from 0.8.0 to 1.0.0 ( #15489 )
...
Bumps [binding_of_caller](https://github.com/banister/binding_of_caller ) from 0.8.0 to 1.0.0.
- [Release notes](https://github.com/banister/binding_of_caller/releases )
- [Commits](https://github.com/banister/binding_of_caller/compare/v0.8.0...v1.0.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-07 14:10:49 +09:00
1ddb91d539
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `config/webpack/configuration.js`:
Upstream updated the `js-yaml` dependency, which changed how to call it.
Those changes conflicted because that code is pretty different in glitch-soc
which has to deal with its more complex theming system.
Proceeded to the same compatibility changes in glitch-soc's code.
- `package.json` and `yarn.lock`:
Not really a conflict, just glitch-soc-specific dependencies textually too
close to some dependencies updated upstream.
2021-01-06 18:08:06 +01:00
3b33a91ce1
Bump nokogiri from 1.10.10 to 1.11.0 ( #15487 )
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.10.10 to 1.11.0.
- [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.10...v1.11.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-05 20:01:31 +01:00
3c3a2b74a8
Bump ruby-progressbar from 1.10.1 to 1.11.0 ( #15491 )
...
Bumps [ruby-progressbar](https://github.com/jfelchner/ruby-progressbar ) from 1.10.1 to 1.11.0.
- [Release notes](https://github.com/jfelchner/ruby-progressbar/releases )
- [Changelog](https://github.com/jfelchner/ruby-progressbar/blob/master/CHANGELOG.md )
- [Commits](https://github.com/jfelchner/ruby-progressbar/compare/releases/v1.10.1...releases/v1.11.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-05 02:10:33 +09:00
ce9583f4a1
Bump simplecov from 0.20.0 to 0.21.0 ( #15485 )
...
Bumps [simplecov](https://github.com/simplecov-ruby/simplecov ) from 0.20.0 to 0.21.0.
- [Release notes](https://github.com/simplecov-ruby/simplecov/releases )
- [Changelog](https://github.com/simplecov-ruby/simplecov/blob/main/CHANGELOG.md )
- [Commits](https://github.com/simplecov-ruby/simplecov/compare/v0.20.0...v0.21.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-05 02:10:10 +09:00
c12782794f
Bump fuubar from 2.5.0 to 2.5.1 ( #15488 )
...
Bumps [fuubar](https://github.com/thekompanee/fuubar ) from 2.5.0 to 2.5.1.
- [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.5.0...releases/2.5.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-05 02:09:39 +09:00
f4a1ff5911
Bump tzinfo-data from 1.2020.5 to 1.2020.6 ( #15479 )
...
Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data ) from 1.2020.5 to 1.2020.6.
- [Release notes](https://github.com/tzinfo/tzinfo-data/releases )
- [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2020.5...v1.2020.6 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-05 02:09:14 +09:00
cff8d1232d
Bump i18n-tasks from 0.9.31 to 0.9.33 ( #15445 )
...
Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks ) from 0.9.31 to 0.9.33.
- [Release notes](https://github.com/glebm/i18n-tasks/releases )
- [Changelog](https://github.com/glebm/i18n-tasks/blob/main/CHANGES.md )
- [Commits](https://github.com/glebm/i18n-tasks/compare/v0.9.31...v0.9.33 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-30 20:14:00 +09:00
e20bc2bcfb
Bump memory_profiler from 0.9.14 to 1.0.0 ( #15289 )
...
Bumps [memory_profiler](https://github.com/SamSaffron/memory_profiler ) from 0.9.14 to 1.0.0.
- [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.14...v1.0.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-30 20:05:32 +09:00
553968dfde
Bump cld3 from 3.3.0 to 3.4.1 ( #15391 )
...
Bumps [cld3](https://github.com/akihikodaki/cld3-ruby ) from 3.3.0 to 3.4.1.
- [Release notes](https://github.com/akihikodaki/cld3-ruby/releases )
- [Commits](https://github.com/akihikodaki/cld3-ruby/compare/v3.3.0...v3.4.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-30 12:39:38 +09:00
38291cb798
Bump webmock from 3.10.0 to 3.11.0 ( #15388 )
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.10.0 to 3.11.0.
- [Release notes](https://github.com/bblimke/webmock/releases )
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bblimke/webmock/compare/v3.10.0...v3.11.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-30 12:17:56 +09:00
20e51b4d76
Bump strong_migrations from 0.7.2 to 0.7.4 ( #15389 )
...
Bumps [strong_migrations](https://github.com/ankane/strong_migrations ) from 0.7.2 to 0.7.4.
- [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.7.2...v0.7.4 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-30 12:17:39 +09:00
e31ace96b2
Bump rubocop-rails from 2.8.1 to 2.9.1 ( #15390 )
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.8.1 to 2.9.1.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.8.1...v2.9.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-30 12:17:11 +09:00
365a844535
Bump rspec-rails from 4.0.1 to 4.0.2 ( #15442 )
...
Bumps [rspec-rails](https://github.com/rspec/rspec-rails ) from 4.0.1 to 4.0.2.
- [Release notes](https://github.com/rspec/rspec-rails/releases )
- [Changelog](https://github.com/rspec/rspec-rails/blob/main/Changelog.md )
- [Commits](https://github.com/rspec/rspec-rails/compare/v4.0.1...v4.0.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-30 12:13:29 +09:00
efba20815b
Bump brakeman from 4.10.0 to 4.10.1 ( #15444 )
...
Bumps [brakeman](https://github.com/presidentbeef/brakeman ) from 4.10.0 to 4.10.1.
- [Release notes](https://github.com/presidentbeef/brakeman/releases )
- [Changelog](https://github.com/presidentbeef/brakeman/blob/main/CHANGES.md )
- [Commits](https://github.com/presidentbeef/brakeman/compare/v4.10.0...v4.10.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-30 12:08:12 +09:00
7ccb814457
Bump tzinfo-data from 1.2020.4 to 1.2020.5 ( #15448 )
...
Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data ) from 1.2020.4 to 1.2020.5.
- [Release notes](https://github.com/tzinfo/tzinfo-data/releases )
- [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2020.4...v1.2020.5 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-30 11:52:41 +09:00
02086ed670
Bump fastimage from 2.2.0 to 2.2.1 ( #15449 )
...
Bumps [fastimage](https://github.com/sdsykes/fastimage ) from 2.2.0 to 2.2.1.
- [Release notes](https://github.com/sdsykes/fastimage/releases )
- [Commits](https://github.com/sdsykes/fastimage/compare/v2.2.0...v2.2.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-30 00:56:17 +09:00
fc00d96c90
Bump capybara from 3.33.0 to 3.34.0 ( #15245 )
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.33.0 to 3.34.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.33.0...3.34.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-30 00:13:48 +09:00
b0810c945b
Bump rubocop from 1.3.1 to 1.7.0 ( #15447 )
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 1.3.1 to 1.7.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/v1.3.1...v1.7.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-30 00:12:03 +09:00
d1087e17d2
Bump rqrcode from 1.1.2 to 1.2.0 ( #15450 )
...
Bumps [rqrcode](https://github.com/whomwah/rqrcode ) from 1.1.2 to 1.2.0.
- [Release notes](https://github.com/whomwah/rqrcode/releases )
- [Commits](https://github.com/whomwah/rqrcode/commits/v1.2.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-30 00:11:30 +09:00
c2393a91e1
Bump aws-sdk-s3 from 1.85.0 to 1.87.0 ( #15446 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.85.0 to 1.87.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/commits )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-30 00:09:11 +09:00
5ed80013df
Bump oj from 3.10.16 to 3.10.18 ( #15443 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.10.16 to 3.10.18.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.10.16...v3.10.18 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-30 00:08:40 +09:00
1305aa330a
Bump tty-prompt from 0.22.0 to 0.23.0 ( #15400 )
...
Bumps [tty-prompt](https://github.com/piotrmurach/tty-prompt ) from 0.22.0 to 0.23.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.22.0...v0.23.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-30 00:08:23 +09:00
6b123044d3
Bump ox from 2.13.4 to 2.14.0 ( #15396 )
...
Bumps [ox](https://github.com/ohler55/ox ) from 2.13.4 to 2.14.0.
- [Release notes](https://github.com/ohler55/ox/releases )
- [Changelog](https://github.com/ohler55/ox/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/ohler55/ox/compare/v2.13.4...v2.14.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-30 00:08:06 +09:00
829d0e8726
Bump json-ld-preloaded from 3.1.3 to 3.1.4 ( #15453 )
...
Bumps [json-ld-preloaded](https://github.com/ruby-rdf/json-ld-preloaded ) from 3.1.3 to 3.1.4.
- [Release notes](https://github.com/ruby-rdf/json-ld-preloaded/releases )
- [Commits](https://github.com/ruby-rdf/json-ld-preloaded/compare/3.1.3...3.1.4 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-30 00:06:48 +09:00
51c826efe4
Bump bullet from 6.1.0 to 6.1.2 ( #15344 )
...
Bumps [bullet](https://github.com/flyerhzm/bullet ) from 6.1.0 to 6.1.2.
- [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/6.1.0...6.1.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-30 00:01:58 +09:00
6ba3e72713
Bump puma from 5.0.4 to 5.1.1 ( #15339 )
...
Bumps [puma](https://github.com/puma/puma ) from 5.0.4 to 5.1.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/v5.0.4...v5.1.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-29 23:55:32 +09:00
48547616b1
Bump json-ld from 3.1.5 to 3.1.7 ( #15454 )
...
Bumps [json-ld](https://github.com/ruby-rdf/json-ld ) from 3.1.5 to 3.1.7.
- [Release notes](https://github.com/ruby-rdf/json-ld/releases )
- [Commits](https://github.com/ruby-rdf/json-ld/compare/3.1.5...3.1.7 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-29 23:53:55 +09:00
dc0387b0d5
Bump active_model_serializers from 0.10.10 to 0.10.12 ( #15329 )
...
Bumps [active_model_serializers](https://github.com/rails-api/active_model_serializers ) from 0.10.10 to 0.10.12.
- [Release notes](https://github.com/rails-api/active_model_serializers/releases )
- [Changelog](https://github.com/rails-api/active_model_serializers/blob/v0.10.12/CHANGELOG.md )
- [Commits](https://github.com/rails-api/active_model_serializers/compare/v0.10.10...v0.10.12 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-29 23:45:23 +09:00
bcf0998b24
Bump simplecov from 0.19.1 to 0.20.0 ( #15244 )
...
Bumps [simplecov](https://github.com/simplecov-ruby/simplecov ) from 0.19.1 to 0.20.0.
- [Release notes](https://github.com/simplecov-ruby/simplecov/releases )
- [Changelog](https://github.com/simplecov-ruby/simplecov/blob/main/CHANGELOG.md )
- [Commits](https://github.com/simplecov-ruby/simplecov/compare/v0.19.1...v0.20.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-29 23:40:35 +09:00
005ea35e7c
Bump pghero from 2.7.2 to 2.7.3 ( #15250 )
...
Bumps [pghero](https://github.com/ankane/pghero ) from 2.7.2 to 2.7.3.
- [Release notes](https://github.com/ankane/pghero/releases )
- [Changelog](https://github.com/ankane/pghero/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ankane/pghero/compare/v2.7.2...v2.7.3 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-29 23:40:12 +09:00
f590a368a2
Bump net-ldap from 0.16.3 to 0.17.0 ( #15242 )
...
Bumps [net-ldap](https://github.com/ruby-ldap/ruby-net-ldap ) from 0.16.3 to 0.17.0.
- [Release notes](https://github.com/ruby-ldap/ruby-net-ldap/releases )
- [Changelog](https://github.com/ruby-ldap/ruby-net-ldap/blob/master/History.rdoc )
- [Commits](https://github.com/ruby-ldap/ruby-net-ldap/compare/v0.16.3...v0.17.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-29 23:32:37 +09:00
659557fb99
Bump faker from 2.14.0 to 2.15.1 ( #15239 )
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.14.0 to 2.15.1.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/compare/v2.14.0...v2.15.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-29 23:28:58 +09:00
e590177b29
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/form/admin_settings.rb`:
New setting added upstream. Ported it.
- `app/views/statuses/_simple_status.html.haml`:
Upstream removed RTL classes. Did the same.
- `config/settings.yml`:
New setting added upstream. Ported it.
2020-12-15 14:27:06 +01:00
df8874b24e
Fix performance on instances list in admin UI ( #15282 )
...
- Reduce duplicate queries
- Remove n+1 queries
- Add accounts count to detailed view
- Add separate action log entry for updating existing domain blocks
2020-12-14 09:06:34 +01:00
ec5783c59c
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/services/remove_status_service.rb`:
Conflict caused by us having a distinc Direct timeline.
Ported upstream changes.
- `app/javascript/mastodon/features/compose/components/compose_form.js`:
Conflict between glitch-soc's variable character limit and upstream
refactoring that part of the code.
Ported upstream changes.
2020-12-05 17:33:37 +01:00
879f86f323
Fix Gemfile.lock breaking CI ( #15257 )
...
Unnecessary Ruby and Bundler version constraints got included in #15230
2020-12-01 12:34:33 +01:00
2207431f39
Bump version to 3.3.0rc1 ( #15230 )
2020-12-01 06:38:05 +01:00
a217a14b58
Fix omniauth (SAML/CAS) sign-in routes not having CSRF protection ( #15228 )
2020-11-28 05:17:53 +01:00
060df6c5c9
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile.lock`:
glitch-soc-only dependency textually too close to updated upstream
dependencies. Updated to upsteam dependencies.
2020-11-25 15:31:45 +01:00
f307883e2f
Bump parallel from 1.20.0 to 1.20.1 ( #15204 )
...
Bumps [parallel](https://github.com/grosser/parallel ) from 1.20.0 to 1.20.1.
- [Release notes](https://github.com/grosser/parallel/releases )
- [Commits](https://github.com/grosser/parallel/compare/v1.20.0...v1.20.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-23 21:02:47 +09:00
65f5857b19
Bump parallel_tests from 3.3.0 to 3.4.0 ( #15203 )
...
Bumps [parallel_tests](https://github.com/grosser/parallel_tests ) from 3.3.0 to 3.4.0.
- [Release notes](https://github.com/grosser/parallel_tests/releases )
- [Changelog](https://github.com/grosser/parallel_tests/blob/master/CHANGELOG.md )
- [Commits](https://github.com/grosser/parallel_tests/compare/v3.3.0...v3.4.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-23 17:02:30 +09:00
a0aff403eb
Bump redis from 4.2.2 to 4.2.5 ( #15202 )
...
Bumps [redis](https://github.com/redis/redis-rb ) from 4.2.2 to 4.2.5.
- [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.2.2...v4.2.5 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-23 17:00:55 +09:00
86807b918f
Bump rubocop from 1.3.0 to 1.3.1 ( #15212 )
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 1.3.0 to 1.3.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/v1.3.0...v1.3.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-23 17:00:23 +09:00
2813d4014d
Bump aws-sdk-s3 from 1.84.1 to 1.85.0 ( #15207 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.84.1 to 1.85.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/commits )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-23 16:59:45 +09:00
3216868024
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/ISSUE_TEMPLATE/bug_report.md`:
Upstream added the `bug` label to bug reports.
Did the same.
- `app/services/fan_out_on_write_service.rb`:
Upstream put DMs back into timelines, glitch-soc was already doing it.
Ignored upstream changes.
2020-11-20 13:27:48 +01:00
75585748c9
Use Ruby 2.7.2 ( #15150 )
...
thwait and e2mmap are no longer needed in Gemfile.
Gems properly require those.
2020-11-19 17:46:46 +01:00
dcdd6e2a47
Bump omniauth-cas from 1.1.1 to 2.0.0 ( #15165 )
...
Bumps [omniauth-cas](https://github.com/dlindahl/omniauth-cas ) from 1.1.1 to 2.0.0.
- [Release notes](https://github.com/dlindahl/omniauth-cas/releases )
- [Changelog](https://github.com/dlindahl/omniauth-cas/blob/master/CHANGELOG.md )
- [Commits](https://github.com/dlindahl/omniauth-cas/compare/v1.1.1...v2.0.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-19 17:43:58 +01:00
ae40e9324b
Bump rubocop from 0.93.1 to 1.3.0 ( #15170 )
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.93.1 to 1.3.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.93.1...v1.3.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-19 17:43:35 +01:00
4e02c8a6b6
Bump bootsnap from 1.5.0 to 1.5.1 ( #15171 )
...
Bumps [bootsnap](https://github.com/Shopify/bootsnap ) from 1.5.0 to 1.5.1.
- [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.5.0...v1.5.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-19 10:45:57 +09:00
a22d74c822
Bump webmock from 3.9.5 to 3.10.0 ( #15172 )
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.9.5 to 3.10.0.
- [Release notes](https://github.com/bblimke/webmock/releases )
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bblimke/webmock/compare/v3.9.5...v3.10.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-19 10:42:05 +09:00
c03b59a589
Bump aws-sdk-s3 from 1.84.0 to 1.84.1 ( #15173 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.84.0 to 1.84.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/commits )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-19 10:28:31 +09:00
499fda5e89
Bump json-ld from 3.1.4 to 3.1.5 ( #15174 )
...
Bumps [json-ld](https://github.com/ruby-rdf/json-ld ) from 3.1.4 to 3.1.5.
- [Release notes](https://github.com/ruby-rdf/json-ld/releases )
- [Commits](https://github.com/ruby-rdf/json-ld/compare/3.1.4...3.1.5 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-19 10:25:12 +09:00
8095a0ab5b
Bump oj from 3.10.15 to 3.10.16 ( #15175 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.10.15 to 3.10.16.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.10.15...v3.10.16 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-19 10:22:24 +09:00
8abcd267f5
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/relationships_controller.rb`:
Upstream changed a line too close to a glitch-soc only line related to
glitch-soc's theming system.
Applied upstream changes accordingly.
2020-11-12 22:13:57 +01:00
551a89f594
Bump better_errors from 2.8.3 to 2.9.1 ( #15117 )
...
Bumps [better_errors](https://github.com/BetterErrors/better_errors ) from 2.8.3 to 2.9.1.
- [Release notes](https://github.com/BetterErrors/better_errors/releases )
- [Commits](https://github.com/BetterErrors/better_errors/compare/v2.8.3...v2.9.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-10 23:11:15 +09:00
bcb83a1c09
Bump aws-sdk-s3 from 1.83.1 to 1.84.0 ( #15135 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.83.1 to 1.84.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/commits )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-10 18:29:30 +09:00
b26c6300ca
Bump webmock from 3.9.3 to 3.9.5 ( #15134 )
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.9.3 to 3.9.5.
- [Release notes](https://github.com/bblimke/webmock/releases )
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bblimke/webmock/compare/v3.9.3...v3.9.5 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-10 18:28:55 +09:00
f8549dd617
Bump bootsnap from 1.4.9 to 1.5.0 ( #15116 )
...
Bumps [bootsnap](https://github.com/Shopify/bootsnap ) from 1.4.9 to 1.5.0.
- [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.9...v1.5.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-10 18:23:24 +09:00
958aad57e8
Bump parallel from 1.19.2 to 1.20.0 ( #15115 )
...
Bumps [parallel](https://github.com/grosser/parallel ) from 1.19.2 to 1.20.0.
- [Release notes](https://github.com/grosser/parallel/releases )
- [Commits](https://github.com/grosser/parallel/compare/v1.19.2...v1.20.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-10 18:20:41 +09:00
db1f81553e
Merge branch 'master' into glitch-soc/merge-upstream
2020-11-07 18:23:02 +01:00
8af56cc1df
Bump puma from 5.0.2 to 5.0.4 ( #15085 )
...
Bumps [puma](https://github.com/puma/puma ) from 5.0.2 to 5.0.4.
- [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/v5.0.2...v5.0.4 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-04 20:44:10 +01:00
7b78195cd6
Bump sidekiq-unique-jobs from 6.0.24 to 6.0.25 ( #15083 )
...
Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs ) from 6.0.24 to 6.0.25.
- [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/commits/v6.0.25 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-04 23:39:02 +09:00
466ef43c87
Bump bootsnap from 1.4.8 to 1.4.9 ( #15086 )
...
Bumps [bootsnap](https://github.com/Shopify/bootsnap ) from 1.4.8 to 1.4.9.
- [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.8...v1.4.9 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-04 23:38:06 +09:00
ea4b2caf3a
Merge branch 'master' into glitch-soc/merge-upstream
2020-11-03 17:28:54 +01:00
6133ded060
Bump tzinfo-data from 1.2020.3 to 1.2020.4 ( #15041 )
...
Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data ) from 1.2020.3 to 1.2020.4.
- [Release notes](https://github.com/tzinfo/tzinfo-data/releases )
- [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2020.3...v1.2020.4 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-27 02:44:48 +09:00
37839573f2
Bump strong_migrations from 0.7.1 to 0.7.2 ( #15044 )
...
Bumps [strong_migrations](https://github.com/ankane/strong_migrations ) from 0.7.1 to 0.7.2.
- [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.7.1...v0.7.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-27 02:43:19 +09:00
9d7bc3cbc3
Bump simplecov from 0.19.0 to 0.19.1 ( #15042 )
...
Bumps [simplecov](https://github.com/simplecov-ruby/simplecov ) from 0.19.0 to 0.19.1.
- [Release notes](https://github.com/simplecov-ruby/simplecov/releases )
- [Changelog](https://github.com/simplecov-ruby/simplecov/blob/main/CHANGELOG.md )
- [Commits](https://github.com/simplecov-ruby/simplecov/compare/v0.19.0...v0.19.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-27 02:41:36 +09:00
e223ef29b8
Bump aws-sdk-s3 from 1.83.0 to 1.83.1 ( #15045 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.83.0 to 1.83.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/commits )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-27 02:41:15 +09:00
c974812908
Bump stackprof from 0.2.15 to 0.2.16 ( #15046 )
...
Bumps [stackprof](https://github.com/tmm1/stackprof ) from 0.2.15 to 0.2.16.
- [Release notes](https://github.com/tmm1/stackprof/releases )
- [Changelog](https://github.com/tmm1/stackprof/blob/master/CHANGELOG.md )
- [Commits](https://github.com/tmm1/stackprof/compare/v0.2.15...v0.2.16 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-27 02:40:37 +09:00
b03d3117c3
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/services/process_mentions_service.rb`:
glitch-soc local-only handling, ported upstream changes
2020-10-26 15:48:16 +01:00
853df7062a
Bump omniauth-saml from 1.10.2 to 1.10.3 ( #15007 )
...
Bumps [omniauth-saml](https://github.com/omniauth/omniauth-saml ) from 1.10.2 to 1.10.3.
- [Release notes](https://github.com/omniauth/omniauth-saml/releases )
- [Changelog](https://github.com/omniauth/omniauth-saml/blob/master/CHANGELOG.md )
- [Commits](https://github.com/omniauth/omniauth-saml/compare/v1.10.2...v1.10.3 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-22 12:46:54 +09:00
d08ea3a3f0
Bump rubocop from 0.93.0 to 0.93.1 ( #15004 )
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.93.0 to 0.93.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.93.0...v0.93.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-22 12:46:25 +09:00
77b3cb061c
Bump tzinfo-data from 1.2020.2 to 1.2020.3 ( #15002 )
...
Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data ) from 1.2020.2 to 1.2020.3.
- [Release notes](https://github.com/tzinfo/tzinfo-data/releases )
- [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2020.2...v1.2020.3 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-22 12:41:42 +09:00
31b99cf795
Bump oj from 3.10.14 to 3.10.15 ( #15009 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.10.14 to 3.10.15.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.10.14...v3.10.15 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-22 12:28:25 +09:00
62d69df815
Bump active_record_query_trace from 1.7 to 1.8 ( #14999 )
...
Bumps [active_record_query_trace](https://github.com/brunofacca/active-record-query-trace ) from 1.7 to 1.8.
- [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](https://github.com/brunofacca/active-record-query-trace/compare/v1.7...v1.8 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-22 12:11:20 +09:00
2848af4566
Bump webmock from 3.9.1 to 3.9.3 ( #14996 )
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.9.1 to 3.9.3.
- [Release notes](https://github.com/bblimke/webmock/releases )
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bblimke/webmock/compare/v3.9.1...v3.9.3 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-22 11:50:01 +09:00
6fdc4e8d47
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/dependabot.yml`:
Updated upstream, we deleted it to not be flooded by Depandabot.
Kept deleted.
- `Gemfile.lock`:
Puma updated on both sides, went for the most recent version.
- `app/controllers/api/v1/mutes_controller.rb`:
Upstream updated the serializer to support timed mutes, while
glitch-soc added a custom API ages ago to get information that
is already available elsewhere.
Dropped the glitch-soc-specific API, went with upstream changes.
- `app/javascript/core/admin.js`:
Conflict due to changing how assets are loaded. Went with upstream.
- `app/javascript/packs/public.js`:
Conflict due to changing how assets are loaded. Went with upstream.
- `app/models/mute.rb`:
🤷
- `app/models/user.rb`:
New user setting added upstream while we have glitch-soc-specific
user settings. Added upstream's user setting.
- `config/settings.yml`:
Upstream added a new user setting close to a user setting we had
changed the defaults for. Added the new upstream setting.
- `package.json`:
Upstream dependency updated “too close” to a glitch-soc-specific
dependency. No real conflict. Updated the dependency.
2020-10-21 19:10:50 +02:00
694a5e33d5
Add follower synchronization mechanism ( #14510 )
...
* Add support for followers synchronization on the receiving end
Check the `collectionSynchronization` attribute on `Create` and `Announce`
activities and synchronize followers from provided collection if possible.
* Add tests for followers synchronization on the receiving end
* Add support for follower synchronization on the sender's end
* Add tests for the sending end
* Switch from AS attributes to HTTP header
Replace the custom `collectionSynchronization` ActivityStreams attribute by
an HTTP header (`X-AS-Collection-Synchronization`) with the same syntax as
the `Signature` header and the following fields:
- `collectionId` to specify which collection to synchronize
- `digest` for the SHA256 hex-digest of the list of followers known on the
receiving instance (where “receiving instance” is determined by accounts
sharing the same host name for their ActivityPub actor `id`)
- `url` of a collection that should be fetched by the instance actor
Internally, move away from the webfinger-based `domain` attribute and use
account `uri` prefix to group accounts.
* Add environment variable to disable followers synchronization
Since the whole mechanism relies on some new preconditions that, in some
extremely rare cases, might not be met, add an environment variable
(DISABLE_FOLLOWERS_SYNCHRONIZATION) to disable the mechanism altogether and
avoid followers being incorrectly removed.
The current conditions are:
1. all managed accounts' actor `id` and inbox URL have the same URI scheme and
netloc.
2. all accounts whose actor `id` or inbox URL share the same URI scheme and
netloc as a managed account must be managed by the same Mastodon instance
as well.
As far as Mastodon is concerned, breaking those preconditions require extensive
configuration changes in the reverse proxy and might also cause other issues.
Therefore, this environment variable provides a way out for people with highly
unusual configurations, and can be safely ignored for the overwhelming majority
of Mastodon administrators.
* Only set follower synchronization header on non-public statuses
This is to avoid unnecessary computations and allow Follow-related
activities to be handled by the usual codepath instead of going through
the synchronization mechanism (otherwise, any Follow/Undo/Accept activity
would trigger the synchronization mechanism even if processing the activity
itself would be enough to re-introduce synchronization)
* Change how ActivityPub::SynchronizeFollowersService handles follow requests
If the remote lists a local follower which we only know has sent a follow
request, consider the follow request as accepted instead of sending an Undo.
* Integrate review feeback
- rename X-AS-Collection-Synchronization to Collection-Synchronization
- various minor refactoring and code style changes
* Only select required fields when computing followers_hash
* Use actor URI rather than webfinger domain in synchronization endpoint
* Change hash computation to be a XOR of individual hashes
Makes it much easier to be memory-efficient, and avoid sorting discrepancy issues.
* Marginally improve followers_hash computation speed
* Further improve hash computation performances by using pluck_each
2020-10-21 18:04:09 +02:00
4b104d4502
Bump rubocop from 0.92.0 to 0.93.0 ( #14967 )
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.92.0 to 0.93.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.92.0...v0.93.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-13 15:45:37 +09:00
d05684bd42
Bump tzinfo-data from 1.2020.1 to 1.2020.2 ( #14966 )
...
Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data ) from 1.2020.1 to 1.2020.2.
- [Release notes](https://github.com/tzinfo/tzinfo-data/releases )
- [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2020.1...v1.2020.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-13 15:27:16 +09:00
dependabot[bot]