dependabot[bot]
829a598f1d
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
Claire
3ad6ef72cb
Merge branch 'main' into glitch-soc/merge-upstream
2021-03-19 13:57:15 +01:00
Claire
43eff898a0
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
dependabot[bot]
9cb6bc56fa
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
dependabot[bot]
506010abc5
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
Claire
eac4a3e9c8
Merge branch 'main' into glitch-soc/merge-upstream
2021-03-15 11:26:59 +01:00
dependabot[bot]
33198d8c05
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
dependabot[bot]
43983bb332
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
dependabot[bot]
1595233185
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
dependabot[bot]
34643df65f
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
dependabot[bot]
ba85109dc1
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
dependabot[bot]
1e6072f035
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
dependabot[bot]
c495ac7e1f
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
dependabot[bot]
9ce47f511b
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
dependabot[bot]
ba0fbc0dd5
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
dependabot[bot]
b5057c4717
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
dependabot[bot]
b8db129f40
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
Claire
1b6a21e6bc
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
dependabot[bot]
d1e5a1babc
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
dependabot[bot]
fd01196fce
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
dependabot[bot]
7d8f33b572
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
dependabot[bot]
0c33444986
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
dependabot[bot]
454d036b74
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
dependabot[bot]
c3786b29b7
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
dependabot[bot]
a6b127eac7
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
dependabot[bot]
c27d320296
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
dependabot[bot]
27d3fc99a9
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
Claire
d8fdbb054e
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
Claire
65db262550
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
dependabot[bot]
287aa75f2e
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
dependabot[bot]
8f5022e687
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
dependabot[bot]
9ff5338508
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
dependabot[bot]
a65ff30b2a
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
dependabot[bot]
7f9bb105b7
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
dependabot[bot]
eb83ab45e2
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
Claire
679642e26c
Merge branch 'main' into glitch-soc/merge-upstream
2021-02-22 15:23:46 +01:00
dependabot[bot]
dcc7c686f3
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
dependabot[bot]
68d1a4ee0c
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
dependabot[bot]
fd2cd8c278
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
dependabot[bot]
ffc5398f91
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
dependabot[bot]
455447ef7c
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
Claire
5e11f3a6e1
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
Claire
21fb3f3684
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
Claire
01e44b886d
Downgrade bootsnap to 1.6.0 ( #15711 )
...
* Revert "Bump bootsnap from 1.5.1 to 1.7.1 (#15669 )"
This reverts commit c3d1b7a2f5
.
* Downgrade bootsnap to 1.6.0
2021-02-11 19:20:58 +01:00
dependabot[bot]
3fcc6b9aff
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
dependabot[bot]
69c1889a6a
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
dependabot[bot]
5dd76ca30e
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
dependabot[bot]
404fd8918c
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
dependabot[bot]
7ec3a9a735
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
dependabot[bot]
c3d1b7a2f5
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
Cecylia Bocovich
e79f8dd85c
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
dependabot[bot]
9962d5c237
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
dependabot[bot]
0a630a1bc3
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
Claire
4d40685850
Merge branch 'main' into glitch-soc/merge-upstream
2021-02-03 17:02:48 +01:00
dependabot[bot]
1d96bf9f43
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
dependabot[bot]
b8aed2d255
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
dependabot[bot]
2620e2cfa3
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
dependabot[bot]
b109df0e2c
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
dependabot[bot]
ab39d5fda5
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
dependabot[bot]
eb0f9e3159
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
dependabot[bot]
38f5631588
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
dependabot[bot]
e9ac263229
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
dependabot[bot]
70128820dc
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
dependabot[bot]
97e075f197
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
dependabot[bot]
3a3990a81d
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
dependabot[bot]
14530a2323
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
Claire
b81710c02c
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
dependabot[bot]
3ca089d4d7
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
Claire
f90fa11db5
Merge branch 'main' into glitch-soc/merge-upstream
2021-01-21 16:51:12 +01:00
dependabot[bot]
71a019d632
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
dependabot[bot]
d8d75cd6c2
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
dependabot[bot]
77368d8ff9
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
dependabot[bot]
c0499c1fcb
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
dependabot[bot]
266a95ee8f
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
dependabot[bot]
8c6a3c18ff
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
Claire
e202314a75
Merge branch 'master' into glitch-soc/merge-upstream
2021-01-18 13:57:12 +01:00
dependabot[bot]
e46b50e805
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
dependabot[bot]
1118194f29
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
dependabot[bot]
4812c16cb5
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
dependabot[bot]
fe6ee39168
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
Claire
33d30632fb
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
dependabot[bot]
32df8950ae
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
Claire
90528f43bc
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
dependabot[bot]
15be57059d
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
dependabot[bot]
c747883dc8
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
dependabot[bot]
77611aad83
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
dependabot[bot]
e1fe8b8b69
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
dependabot[bot]
592f999d4f
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
dependabot[bot]
b5bd67a477
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
dependabot[bot]
b9ad289502
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
dependabot[bot]
ccd7bc6da7
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
dependabot[bot]
5a5b89397e
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
dependabot[bot]
000947250a
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
dependabot[bot]
7b7b102a63
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
dependabot[bot]
102e68218d
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
dependabot[bot]
68c9f8d9a3
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
dependabot[bot]
a4be95e48f
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
dependabot[bot]
fac50ac0d5
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
dependabot[bot]
b379349053
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
dependabot[bot]
8e59e26e2b
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
dependabot[bot]
6b74380917
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
dependabot[bot]
e329ddc580
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
dependabot[bot]
bccd0fdd17
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
dependabot[bot]
26d63df65c
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
dependabot[bot]
b1e4f7b89f
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
dependabot[bot]
954a77ed86
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
dependabot[bot]
7cf1bdcf2c
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
dependabot[bot]
5c46bd4845
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
dependabot[bot]
aee44f4328
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
dependabot[bot]
96941cf8ac
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
dependabot[bot]
df30ae1d1c
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
dependabot[bot]
87b97ab048
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
dependabot[bot]
20789e7e60
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
dependabot[bot]
3cc9789eb2
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
Claire
e4f8679eae
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
Eugen Rochko
216b85b053
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
Claire
f8d867bac4
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
ThibG
4b7f21a28e
Fix Gemfile.lock breaking CI ( #15257 )
...
Unnecessary Ruby and Bundler version constraints got included in #15230
2020-12-01 12:34:33 +01:00
Eugen Rochko
8e0b98556f
Bump version to 3.3.0rc1 ( #15230 )
2020-12-01 06:38:05 +01:00
Eugen Rochko
13b07b88f1
Fix omniauth (SAML/CAS) sign-in routes not having CSRF protection ( #15228 )
2020-11-28 05:17:53 +01:00
Thibaut Girka
e71b16ae2b
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
dependabot[bot]
6b6b1ea2fb
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
dependabot[bot]
005354b98e
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
dependabot[bot]
af607c6528
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
dependabot[bot]
9536ce1454
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
dependabot[bot]
b257c50571
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
Thibaut Girka
48f0f3ffee
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
Daigo 3 Dango
541b9f8c1c
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
dependabot[bot]
67ace1d890
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
dependabot[bot]
1a9099ca7c
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
dependabot[bot]
a3f3a9113d
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
dependabot[bot]
9b188a65be
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
dependabot[bot]
78a3956729
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
dependabot[bot]
beddf821d7
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
dependabot[bot]
feeaa6f50d
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
Thibaut Girka
c077cdaba7
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
dependabot[bot]
e9b4d97d88
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
dependabot[bot]
501261cb90
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
dependabot[bot]
c19f934fe8
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
dependabot[bot]
44fb2038c9
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
dependabot[bot]
21d1989b53
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
Thibaut Girka
412218af2e
Merge branch 'master' into glitch-soc/merge-upstream
2020-11-07 18:23:02 +01:00
dependabot[bot]
f90620b2f3
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
dependabot[bot]
d60485cb72
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
dependabot[bot]
f43000d32c
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
Thibaut Girka
cd675fbe18
Merge branch 'master' into glitch-soc/merge-upstream
2020-11-03 17:28:54 +01:00
dependabot[bot]
336b6a3c3f
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
dependabot[bot]
1eda0a9a25
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
dependabot[bot]
8b4654fd85
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
dependabot[bot]
652f6269f9
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
dependabot[bot]
853d2761e4
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
Thibaut Girka
9c34090db8
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
dependabot[bot]
39d7562f89
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
dependabot[bot]
90611276ed
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
dependabot[bot]
cf5f8a7657
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
dependabot[bot]
5598c670fc
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
dependabot[bot]
5567a50a25
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
dependabot[bot]
0e37e2682c
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
Thibaut Girka
ec49aa8175
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
ThibG
ca56527140
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
dependabot[bot]
06c3d36395
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
dependabot[bot]
5b131f08e1
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
Eugen Rochko
7d985f2aac
Remove dependency on goldfinger gem ( #14919 )
...
There are edge cases where requests to certain hosts timeout when
using the vanilla HTTP.rb gem, which the goldfinger gem uses. Now
that we no longer need to support OStatus servers, webfinger logic
is so simple that there is no point encapsulating it in a gem, so
we can just use our own Request class. With that, we benefit from
more robust timeout code and IPv4/IPv6 resolution.
Fix #14091
2020-10-08 00:34:57 +02:00
dependabot[bot]
8e6abbc4b9
Bump aws-sdk-core from 3.109.0 to 3.109.1 ( #14943 )
...
Bumps [aws-sdk-core](https://github.com/aws/aws-sdk-ruby ) from 3.109.0 to 3.109.1.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-core/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-06 17:49:56 +09:00
dependabot[bot]
66aa520acd
Bump better_errors from 2.8.1 to 2.8.3 ( #14927 )
...
Bumps [better_errors](https://github.com/BetterErrors/better_errors ) from 2.8.1 to 2.8.3.
- [Release notes](https://github.com/BetterErrors/better_errors/releases )
- [Commits](https://github.com/BetterErrors/better_errors/compare/v2.8.1...v2.8.3 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-06 17:40:09 +09:00
dependabot[bot]
546e4899dd
Bump simple_form from 5.0.2 to 5.0.3 ( #14923 )
...
Bumps [simple_form](https://github.com/plataformatec/simple_form ) from 5.0.2 to 5.0.3.
- [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.2...v5.0.3 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-06 17:17:27 +09:00
dependabot[bot]
d87a172972
Bump rspec-core from 3.9.2 to 3.9.3 ( #14934 )
...
Bumps [rspec-core](https://github.com/rspec/rspec-core ) from 3.9.2 to 3.9.3.
- [Release notes](https://github.com/rspec/rspec-core/releases )
- [Changelog](https://github.com/rspec/rspec-core/blob/main/Changelog.md )
- [Commits](https://github.com/rspec/rspec-core/compare/v3.9.2...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-06 17:11:59 +09:00
dependabot[bot]
2e9dc7eb98
Bump brakeman from 4.9.1 to 4.10.0 ( #14933 )
...
Bumps [brakeman](https://github.com/presidentbeef/brakeman ) from 4.9.1 to 4.10.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.9.1...v4.10.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-06 17:07:50 +09:00
dependabot[bot]
a30c997586
Bump hamlit from 2.11.1 to 2.13.0 ( #14924 )
...
Bumps [hamlit](https://github.com/k0kubun/hamlit ) from 2.11.1 to 2.13.0.
- [Release notes](https://github.com/k0kubun/hamlit/releases )
- [Changelog](https://github.com/k0kubun/hamlit/blob/master/CHANGELOG.md )
- [Commits](https://github.com/k0kubun/hamlit/compare/v2.11.1...v2.13.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-06 17:06:23 +09:00
dependabot[bot]
80975c42fc
Bump regexp_parser from 1.8.0 to 1.8.1 ( #14928 )
...
Bumps [regexp_parser](https://github.com/ammar/regexp_parser ) from 1.8.0 to 1.8.1.
- [Release notes](https://github.com/ammar/regexp_parser/releases )
- [Changelog](https://github.com/ammar/regexp_parser/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ammar/regexp_parser/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>
2020-10-06 17:00:19 +09:00
dependabot[bot]
30941dd6ea
Bump aws-sdk-s3 from 1.81.1 to 1.83.0 ( #14929 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.81.1 to 1.83.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-10-06 16:56:13 +09:00
dependabot[bot]
df8c6572d4
Bump rubocop-ast from 0.7.0 to 0.7.1 ( #14899 )
...
Bumps [rubocop-ast](https://github.com/rubocop-hq/rubocop-ast ) from 0.7.0 to 0.7.1.
- [Release notes](https://github.com/rubocop-hq/rubocop-ast/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop-ast/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop-ast/compare/v0.7.0...v0.7.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-01 15:33:24 +09:00
mayaeh
2ee7e2c5c3
Bump puma from 5.0.1 to 5.0.2 ( #14904 )
...
https://github.com/puma/puma/blob/master/History.md#502--2020-09-28
2020-09-30 14:32:00 +02:00
dependabot[bot]
a8367e26c9
Bump rubocop from 0.91.0 to 0.92.0 ( #14885 )
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.91.0 to 0.92.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.91.0...v0.92.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-29 14:59:31 +09:00
dependabot[bot]
47fdf5c505
Bump simplecov-html from 0.12.2 to 0.12.3 ( #14883 )
...
Bumps [simplecov-html](https://github.com/simplecov-ruby/simplecov-html ) from 0.12.2 to 0.12.3.
- [Release notes](https://github.com/simplecov-ruby/simplecov-html/releases )
- [Changelog](https://github.com/simplecov-ruby/simplecov-html/blob/main/CHANGELOG.md )
- [Commits](https://github.com/simplecov-ruby/simplecov-html/compare/v0.12.2...v0.12.3 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-29 04:11:43 +09:00
dependabot[bot]
469029b557
Bump parser from 2.7.1.4 to 2.7.1.5 ( #14879 )
...
Bumps [parser](https://github.com/whitequark/parser ) from 2.7.1.4 to 2.7.1.5.
- [Release notes](https://github.com/whitequark/parser/releases )
- [Changelog](https://github.com/whitequark/parser/blob/master/CHANGELOG.md )
- [Commits](https://github.com/whitequark/parser/compare/v2.7.1.4...v2.7.1.5 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-29 04:09:25 +09:00
dependabot[bot]
c9efb2028c
Bump sidekiq-unique-jobs from 6.0.23 to 6.0.24 ( #14877 )
...
Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs ) from 6.0.23 to 6.0.24.
- [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 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-29 04:07:42 +09:00
dependabot[bot]
7986e2e4d3
Bump raabro from 1.3.1 to 1.3.3 ( #14888 )
...
Bumps [raabro](https://github.com/floraison/raabro ) from 1.3.1 to 1.3.3.
- [Release notes](https://github.com/floraison/raabro/releases )
- [Changelog](https://github.com/floraison/raabro/blob/master/CHANGELOG.md )
- [Commits](https://github.com/floraison/raabro/compare/v1.3.1...v1.3.3 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-29 04:06:27 +09:00
dependabot[bot]
3754c877ca
Bump aws-sdk-s3 from 1.81.0 to 1.81.1 ( #14884 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.81.0 to 1.81.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-09-29 03:53:04 +09:00
dependabot[bot]
e88ddb0949
Bump pkg-config from 1.4.3 to 1.4.4 ( #14881 )
...
Bumps [pkg-config](https://github.com/ruby-gnome/pkg-config ) from 1.4.3 to 1.4.4.
- [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.3...1.4.4 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-29 03:52:46 +09:00
ThibG
559e1dfd94
Bump puma to 5.0.1 ( #14895 )
...
Fixes LoadError on some OSes/architectures
2020-09-28 18:11:54 +02:00
Thibaut Girka
1ce3acac27
Bump puma to 5.0.1
...
Fixes LoadError on some OSes/architectures
2020-09-28 17:56:16 +02:00
Thibaut Girka
a7aedebc31
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile.lock`:
Not a real conflict, upstream updated dependencies that were too close to
glitch-soc-only ones in the file.
- `app/controllers/oauth/authorized_applications_controller.rb`:
Upstream changed the logic surrounding suspended accounts.
Minor conflict due to glitch-soc's theming system.
Ported upstream changes.
- `app/controllers/settings/base_controller.rb`:
Upstream refactored and changed the logic surrounding suspended accounts.
Minor conflict due to glitch-soc's theming system.
Ported upstream changes.
- `app/controllers/settings/sessions_controller.rb`:
Upstream refactored and changed the logic surrounding suspended accounts.
Minor conflict due to glitch-soc's theming system.
Ported upstream changes.
- `app/models/user.rb`:
Upstream refactored and changed the logic surrounding suspended accounts.
Minor conflict due to glitch-soc not preventing moved accounts from logging
in.
Ported upstream changes while keeping the ability for moved accounts to log
in.
- `app/policies/status_policy.rb`:
Upstream refactored and changed the logic surrounding suspended accounts.
Minor conflict due to glitch-soc's local-only toots.
Ported upstream changes.
- `app/serializers/rest/account_serializer.rb`:
Upstream refactored and changed the logic surrounding suspended accounts.
Minor conflict due to glitch-soc's ability to hide followers count.
Ported upstream changes.
- `app/services/process_mentions_service.rb`:
Upstream refactored and changed the logic surrounding suspended accounts.
Minor conflict due to glitch-soc's local-only toots.
Ported upstream changes.
- `package.json`:
Not a real conflict, upstream updated dependencies that were too close to
glitch-soc-only ones in the file.
2020-09-28 14:13:30 +02:00
dependabot[bot]
b09810a505
Bump puma from 4.3.6 to 5.0.0 ( #14830 )
...
Bumps [puma](https://github.com/puma/puma ) from 4.3.6 to 5.0.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/v4.3.6...v5.0.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-22 15:23:36 +02:00
dependabot[bot]
2dee03900e
Bump parallel_tests from 3.2.0 to 3.3.0 ( #14843 )
...
Bumps [parallel_tests](https://github.com/grosser/parallel_tests ) from 3.2.0 to 3.3.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.2.0...v3.3.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-22 16:53:24 +09:00
dependabot[bot]
6926b771a5
Bump premailer from 1.13.1 to 1.14.2 ( #14857 )
...
Bumps [premailer](https://github.com/premailer/premailer ) from 1.13.1 to 1.14.2.
- [Release notes](https://github.com/premailer/premailer/releases )
- [Changelog](https://github.com/premailer/premailer/blob/master/CHANGELOG.md )
- [Commits](https://github.com/premailer/premailer/compare/v1.13.1...v1.14.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-22 16:53:01 +09:00
dependabot[bot]
24da180901
Bump rubocop from 0.90.0 to 0.91.0 ( #14835 )
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.90.0 to 0.91.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.90.0...v0.91.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-22 14:36:46 +09:00
dependabot[bot]
8c6312f853
Bump nio4r from 2.5.3 to 2.5.4 ( #14837 )
...
Bumps [nio4r](https://github.com/socketry/nio4r ) from 2.5.3 to 2.5.4.
- [Release notes](https://github.com/socketry/nio4r/releases )
- [Changelog](https://github.com/socketry/nio4r/blob/master/CHANGES.md )
- [Commits](https://github.com/socketry/nio4r/compare/v2.5.3...v2.5.4 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-22 14:35:45 +09:00
dependabot[bot]
61fcb33ff2
Bump pkg-config from 1.4.2 to 1.4.3 ( #14838 )
...
Bumps [pkg-config](https://github.com/ruby-gnome/pkg-config ) from 1.4.2 to 1.4.3.
- [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.2...1.4.3 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-22 14:35:30 +09:00
dependabot[bot]
36da58556c
Bump devise from 4.7.2 to 4.7.3 ( #14845 )
...
Bumps [devise](https://github.com/plataformatec/devise ) from 4.7.2 to 4.7.3.
- [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.2...v4.7.3 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-22 14:33:37 +09:00
dependabot[bot]
19353df01d
Bump crack from 0.4.3 to 0.4.4 ( #14833 )
...
Bumps [crack](https://github.com/jnunemaker/crack ) from 0.4.3 to 0.4.4.
- [Release notes](https://github.com/jnunemaker/crack/releases )
- [Changelog](https://github.com/jnunemaker/crack/blob/master/History )
- [Commits](https://github.com/jnunemaker/crack/compare/v0.4.3...v0.4.4 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-22 14:33:00 +09:00
dependabot[bot]
cc8c7d6477
Bump rubocop-rails from 2.8.0 to 2.8.1 ( #14832 )
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.8.0 to 2.8.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.0...v2.8.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-22 14:31:39 +09:00
dependabot[bot]
687e04aaa0
Bump fugit from 1.3.8 to 1.3.9 ( #14829 )
...
Bumps [fugit](https://github.com/floraison/fugit ) from 1.3.8 to 1.3.9.
- [Release notes](https://github.com/floraison/fugit/releases )
- [Changelog](https://github.com/floraison/fugit/blob/master/CHANGELOG.md )
- [Commits](https://github.com/floraison/fugit/compare/v1.3.8...v1.3.9 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-22 14:30:53 +09:00
dependabot[bot]
dd7c70a615
Bump aws-sdk-s3 from 1.80.0 to 1.81.0 ( #14826 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.80.0 to 1.81.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-09-21 21:25:53 +09:00
dependabot[bot]
41bf9384ae
Bump better_errors from 2.7.1 to 2.8.1 ( #14825 )
...
Bumps [better_errors](https://github.com/BetterErrors/better_errors ) from 2.7.1 to 2.8.1.
- [Release notes](https://github.com/BetterErrors/better_errors/releases )
- [Commits](https://github.com/BetterErrors/better_errors/compare/v2.7.1...v2.8.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-21 16:12:11 +09:00
dependabot[bot]
b7d7485fe3
Bump faker from 2.13.0 to 2.14.0 ( #14824 )
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.13.0 to 2.14.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.13.0...v2.14.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-21 16:11:55 +09:00
dependabot[bot]
75e4bd9413
Bump thor from 0.20.3 to 1.0.1 ( #14783 )
...
Bumps [thor](https://github.com/erikhuda/thor ) from 0.20.3 to 1.0.1.
- [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/v0.20.3...v1.0.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-16 20:40:12 +02:00
dependabot[bot]
4de893113b
Bump rubocop-ast from 0.3.0 to 0.4.0 ( #14785 )
...
Bumps [rubocop-ast](https://github.com/rubocop-hq/rubocop-ast ) from 0.3.0 to 0.4.0.
- [Release notes](https://github.com/rubocop-hq/rubocop-ast/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop-ast/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop-ast/compare/v0.3.0...v0.4.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-16 20:39:05 +02:00
dependabot[bot]
2cfbde41bc
Bump webmock from 3.8.3 to 3.9.1 ( #14780 )
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.8.3 to 3.9.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.8.3...v3.9.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-16 12:45:52 +09:00
dependabot[bot]
8c8cb7f1f8
Bump sprockets-rails from 3.2.1 to 3.2.2 ( #14788 )
...
Bumps [sprockets-rails](https://github.com/rails/sprockets-rails ) from 3.2.1 to 3.2.2.
- [Release notes](https://github.com/rails/sprockets-rails/releases )
- [Commits](https://github.com/rails/sprockets-rails/compare/v3.2.1...v3.2.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-15 23:16:57 +09:00
dependabot[bot]
cbc45378ea
Bump ox from 2.13.3 to 2.13.4 ( #14787 )
...
Bumps [ox](https://github.com/ohler55/ox ) from 2.13.3 to 2.13.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.13.3...v2.13.4 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-15 23:14:39 +09:00
dependabot[bot]
acdae79f33
Bump pghero from 2.7.0 to 2.7.2 ( #14786 )
...
Bumps [pghero](https://github.com/ankane/pghero ) from 2.7.0 to 2.7.2.
- [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.0...v2.7.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-15 23:14:15 +09:00
dependabot[bot]
7a54779c72
Bump redis from 4.2.1 to 4.2.2 ( #14784 )
...
Bumps [redis](https://github.com/redis/redis-rb ) from 4.2.1 to 4.2.2.
- [Release notes](https://github.com/redis/redis-rb/releases )
- [Changelog](https://github.com/redis/redis-rb/blob/master/CHANGELOG.md )
- [Commits](https://github.com/redis/redis-rb/compare/v4.2.1...v4.2.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-15 23:13:31 +09:00
dependabot[bot]
b677ae9e6f
Bump sidekiq from 6.1.1 to 6.1.2 ( #14782 )
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 6.1.1 to 6.1.2.
- [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.1...v6.1.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-15 23:13:12 +09:00
dependabot[bot]
b6985fdb6c
Bump rails from 5.2.4.3 to 5.2.4.4 ( #14792 )
...
Bumps [rails](https://github.com/rails/rails ) from 5.2.4.3 to 5.2.4.4.
- [Release notes](https://github.com/rails/rails/releases )
- [Commits](https://github.com/rails/rails/compare/v5.2.4.3...v5.2.4.4 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-14 22:08:13 +09:00
dependabot[bot]
3df3e63363
Bump aws-sdk-s3 from 1.79.1 to 1.80.0 ( #14789 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.79.1 to 1.80.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-09-14 22:02:42 +09:00
Thibaut Girka
9748f074a3
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/api/v1/timelines/public_controller.rb
- app/lib/feed_manager.rb
- app/models/status.rb
- app/services/precompute_feed_service.rb
- app/workers/feed_insert_worker.rb
- spec/models/status_spec.rb
All conflicts are due to upstream refactoring feed management and us having
local-only toots on top of that. Rewrote local-only toots management for
upstream's changes.
2020-09-08 16:26:47 +02:00
dependabot[bot]
d1c68aa0d8
Bump puma from 4.3.5 to 4.3.6 ( #14750 )
...
Bumps [puma](https://github.com/puma/puma ) from 4.3.5 to 4.3.6.
- [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/v4.3.5...v4.3.6 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-08 08:23:13 +09:00
dependabot[bot]
60282931c1
Bump rubocop from 0.88.0 to 0.90.0 ( #14747 )
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.88.0 to 0.90.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.88.0...v0.90.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-08 08:22:54 +09:00
dependabot[bot]
4dfa9a58de
Bump ox from 2.13.2 to 2.13.3 ( #14751 )
...
Bumps [ox](https://github.com/ohler55/ox ) from 2.13.2 to 2.13.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.13.2...v2.13.3 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-08 05:22:50 +09:00
dependabot[bot]
ae36540455
Bump oj from 3.10.13 to 3.10.14 ( #14749 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.10.13 to 3.10.14.
- [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.13...v3.10.14 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-08 05:22:33 +09:00
dependabot[bot]
50f763fcd9
Bump aws-partitions from 1.363.0 to 1.365.0 ( #14748 )
...
Bumps [aws-partitions](https://github.com/aws/aws-sdk-ruby ) from 1.363.0 to 1.365.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-partitions/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-09-08 05:21:01 +09:00
dependabot[bot]
1fb01185a9
Bump public_suffix from 4.0.5 to 4.0.6 ( #14743 )
...
Bumps [public_suffix](https://github.com/weppos/publicsuffix-ruby ) from 4.0.5 to 4.0.6.
- [Release notes](https://github.com/weppos/publicsuffix-ruby/releases )
- [Changelog](https://github.com/weppos/publicsuffix-ruby/blob/master/CHANGELOG.md )
- [Commits](https://github.com/weppos/publicsuffix-ruby/compare/v4.0.5...v4.0.6 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-08 05:15:39 +09:00
dependabot[bot]
744aeefb4e
Bump bcrypt from 3.1.15 to 3.1.16 ( #14739 )
...
Bumps [bcrypt](https://github.com/codahale/bcrypt-ruby ) from 3.1.15 to 3.1.16.
- [Release notes](https://github.com/codahale/bcrypt-ruby/releases )
- [Changelog](https://github.com/codahale/bcrypt-ruby/blob/master/CHANGELOG )
- [Commits](https://github.com/codahale/bcrypt-ruby/compare/v3.1.15...v3.1.16 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-08 05:11:21 +09:00
dependabot[bot]
5179a8051c
Bump warden from 1.2.8 to 1.2.9 ( #14738 )
...
Bumps [warden](https://github.com/hassox/warden ) from 1.2.8 to 1.2.9.
- [Release notes](https://github.com/hassox/warden/releases )
- [Changelog](https://github.com/wardencommunity/warden/blob/master/CHANGELOG.md )
- [Commits](https://github.com/hassox/warden/compare/v1.2.8...v1.2.9 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-08 05:10:49 +09:00
dependabot[bot]
0f39fc609f
Bump brakeman from 4.9.0 to 4.9.1 ( #14737 )
...
Bumps [brakeman](https://github.com/presidentbeef/brakeman ) from 4.9.0 to 4.9.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.9.0...v4.9.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-08 05:09:44 +09:00
dependabot[bot]
081571549c
Bump rdf from 3.1.5 to 3.1.6 ( #14736 )
...
Bumps [rdf](https://github.com/ruby-rdf/rdf ) from 3.1.5 to 3.1.6.
- [Release notes](https://github.com/ruby-rdf/rdf/releases )
- [Changelog](https://github.com/ruby-rdf/rdf/blob/develop/CHANGES.md )
- [Commits](https://github.com/ruby-rdf/rdf/compare/3.1.5...3.1.6 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-08 05:08:59 +09:00
dependabot[bot]
507ed51983
Bump rubocop-rails from 2.6.0 to 2.8.0 ( #14734 )
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.6.0 to 2.8.0.
- [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.6.0...v2.8.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-08 05:08:17 +09:00
dependabot[bot]
4c2f87e24e
Bump sidekiq-unique-jobs from 6.0.22 to 6.0.23 ( #14735 )
...
Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs ) from 6.0.22 to 6.0.23.
- [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.22...v6.0.23 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-08 05:06:23 +09:00
Thibaut Girka
3fefb7909b
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `config/webpack/shared.js`:
Upstream has changed how Tesseract.js gets included and dropped a dependency.
The conflict is caused by glitch-soc having different code due to its
theming system.
Ported upstream changes.
- `lib/mastodon/version.rb`:
Upstream refactor/code style change in a place we replaced upstream's
repo URL with ours.
Ported upstram changes, keeping our repo URL.
- `yarn.lock`:
Upstream dropped dependencies, one of which was textually too close to
a glitch-soc-specific dependency. Not a real conflict.
2020-09-01 17:02:18 +02:00
dependabot[bot]
8972e5f7f6
Bump rubocop from 0.86.0 to 0.88.0 ( #14412 )
...
* Bump rubocop from 0.86.0 to 0.88.0
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.86.0 to 0.88.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.86.0...v0.88.0 )
Signed-off-by: dependabot[bot] <support@github.com>
* Fix for latest RuboCop
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2020-09-01 03:04:00 +02:00
dependabot[bot]
10f180417e
Bump aws-partitions from 1.362.0 to 1.363.0 ( #14713 )
...
Bumps [aws-partitions](https://github.com/aws/aws-sdk-ruby ) from 1.362.0 to 1.363.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-partitions/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-09-01 02:58:51 +02:00
dependabot[bot]
5c87891ea3
Bump hamlit from 2.11.0 to 2.11.1 ( #14689 )
...
Bumps [hamlit](https://github.com/k0kubun/hamlit ) from 2.11.0 to 2.11.1.
- [Release notes](https://github.com/k0kubun/hamlit/releases )
- [Changelog](https://github.com/k0kubun/hamlit/blob/master/CHANGELOG.md )
- [Commits](https://github.com/k0kubun/hamlit/compare/v2.11.0...v2.11.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-01 02:57:12 +02:00
dependabot[bot]
e3b4d3179a
Bump aws-sdk-s3 from 1.78.0 to 1.79.1 ( #14691 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.78.0 to 1.79.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-09-01 02:56:53 +02:00
dependabot[bot]
581c27510e
Bump aws-sdk-core from 3.104.4 to 3.105.0 ( #14694 )
...
Bumps [aws-sdk-core](https://github.com/aws/aws-sdk-ruby ) from 3.104.4 to 3.105.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-core/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-09-01 02:56:32 +02:00
dependabot[bot]
476f7e8248
Bump microformats from 4.2.0 to 4.2.1 ( #14699 )
...
Bumps [microformats](https://github.com/microformats/microformats-ruby ) from 4.2.0 to 4.2.1.
- [Release notes](https://github.com/microformats/microformats-ruby/releases )
- [Commits](https://github.com/microformats/microformats-ruby/compare/v4.2.0...v4.2.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-01 02:56:08 +02:00
dependabot[bot]
0f568f8431
Bump loofah from 2.6.0 to 2.7.0 ( #14701 )
...
Bumps [loofah](https://github.com/flavorjones/loofah ) from 2.6.0 to 2.7.0.
- [Release notes](https://github.com/flavorjones/loofah/releases )
- [Changelog](https://github.com/flavorjones/loofah/blob/master/CHANGELOG.md )
- [Commits](https://github.com/flavorjones/loofah/compare/v2.6.0...v2.7.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-01 02:55:48 +02:00
dependabot[bot]
65d78d4f94
Bump parallel_tests from 3.1.0 to 3.2.0 ( #14702 )
...
Bumps [parallel_tests](https://github.com/grosser/parallel_tests ) from 3.1.0 to 3.2.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.1.0...v3.2.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-01 02:55:16 +02:00
dependabot[bot]
af2396433a
Bump oj from 3.10.12 to 3.10.13 ( #14704 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.10.12 to 3.10.13.
- [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.12...v3.10.13 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-01 02:54:34 +02:00
Thibaut Girka
8c3c27bf06
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/accounts_controller.rb`:
Upstream change too close to a glitch-soc change related to
instance-local toots. Merged upstream changes.
- `app/services/fan_out_on_write_service.rb`:
Minor conflict due to glitch-soc's handling of Direct Messages,
merged upstream changes.
- `yarn.lock`:
Not really a conflict, caused by glitch-soc-only dependencies
being textually too close to updated upstream dependencies.
Merged upstream changes.
2020-08-30 16:13:08 +02:00
dependabot[bot]
22081567ab
Bump net-ldap from 0.16.2 to 0.16.3 ( #14627 )
...
Bumps [net-ldap](https://github.com/ruby-ldap/ruby-net-ldap ) from 0.16.2 to 0.16.3.
- [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.2...v0.16.3 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-25 21:02:06 +09:00
dependabot[bot]
eeff3bf9e0
Bump elasticsearch-transport from 7.8.1 to 7.9.0 ( #14624 )
...
Bumps [elasticsearch-transport](https://github.com/elastic/elasticsearch-ruby ) from 7.8.1 to 7.9.0.
- [Release notes](https://github.com/elastic/elasticsearch-ruby/releases )
- [Changelog](https://github.com/elastic/elasticsearch-ruby/blob/master/CHANGELOG.md )
- [Commits](https://github.com/elastic/elasticsearch-ruby/compare/v7.8.1...v7.9.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-25 20:58:59 +09:00
dependabot[bot]
7ab7fc7577
Bump redis-namespace from 1.7.0 to 1.8.0 ( #14623 )
...
Bumps [redis-namespace](https://github.com/resque/redis-namespace ) from 1.7.0 to 1.8.0.
- [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.7.0...v1.8.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-25 20:57:44 +09:00
dependabot[bot]
9a1c350924
Bump jwt from 2.2.1 to 2.2.2 ( #14621 )
...
Bumps [jwt](https://github.com/jwt/ruby-jwt ) from 2.2.1 to 2.2.2.
- [Release notes](https://github.com/jwt/ruby-jwt/releases )
- [Changelog](https://github.com/jwt/ruby-jwt/blob/master/CHANGELOG.md )
- [Commits](https://github.com/jwt/ruby-jwt/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>
2020-08-25 20:53:09 +09:00
dependabot[bot]
fc52962667
Bump webpacker from 5.2.0 to 5.2.1 ( #14619 )
...
Bumps [webpacker](https://github.com/rails/webpacker ) from 5.2.0 to 5.2.1.
- [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.0...v5.2.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-25 20:49:20 +09:00
dependabot[bot]
5678b195ff
Bump oj from 3.10.8 to 3.10.12 ( #14620 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.10.8 to 3.10.12.
- [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.8...v3.10.12 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-25 20:45:57 +09:00
dependabot[bot]
32567acdd0
Bump aws-sdk-core from 3.104.3 to 3.104.4 ( #14618 )
...
Bumps [aws-sdk-core](https://github.com/aws/aws-sdk-ruby ) from 3.104.3 to 3.104.4.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-core/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-08-25 20:44:58 +09:00
santiagorodriguez96
e8d41bc2fe
Add WebAuthn as an alternative 2FA method ( #14466 )
...
* feat: add possibility of adding WebAuthn security keys to use as 2FA
This adds a basic UI for enabling WebAuthn 2FA. We did a little refactor
to the Settings page for editing the 2FA methods – now it will list the
methods that are available to the user (TOTP and WebAuthn) and from
there they'll be able to add or remove any of them.
Also, it's worth mentioning that for enabling WebAuthn it's required to
have TOTP enabled, so the first time that you go to the 2FA Settings
page, you'll be asked to set it up.
This work was inspired by the one donde by Github in their platform, and
despite it could be approached in different ways, we decided to go with
this one given that we feel that this gives a great UX.
Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com>
* feat: add request for WebAuthn as second factor at login if enabled
This commits adds the feature for using WebAuthn as a second factor for
login when enabled.
If users have WebAuthn enabled, now a page requesting for the use of a
WebAuthn credential for log in will appear, although a link redirecting
to the old page for logging in using a two-factor code will also be
present.
Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com>
* feat: add possibility of deleting WebAuthn Credentials
Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com>
* feat: disable WebAuthn when an Admin disables 2FA for a user
Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com>
* feat: remove ability to disable TOTP leaving only WebAuthn as 2FA
Following examples form other platforms like Github, we decided to make
Webauthn 2FA secondary to 2FA with TOTP, so that we removed the
possibility of removing TOTP authentication only, leaving users with
just WEbAuthn as 2FA. Instead, users will have to click on 'Disable 2FA'
in order to remove second factor auth.
The reason for WebAuthn being secondary to TOPT is that in that way,
users will still be able to log in using their code from their phone's
application if they don't have their security keys with them – or maybe
even lost them.
* We had to change a little the flow for setting up TOTP, given that now
it's possible to setting up again if you already had TOTP, in order to
let users modify their authenticator app – given that now it's not
possible for them to disable TOTP and set it up again with another
authenticator app.
So, basically, now instead of storing the new `otp_secret` in the
user, we store it in the session until the process of set up is
finished.
This was because, as it was before, when users clicked on 'Edit' in
the new two-factor methods lists page, but then went back without
finishing the flow, their `otp_secret` had been changed therefore
invalidating their previous authenticator app, making them unable to
log in again using TOTP.
Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com>
* refactor: fix eslint errors
The PR build was failing given that linting returning some errors.
This commit attempts to fix them.
* refactor: normalize i18n translations
The build was failing given that i18n translations files were not
normalized.
This commits fixes that.
* refactor: avoid having the webauthn gem locked to a specific version
* refactor: use symbols for routes without '/'
* refactor: avoid sending webauthn disabled email when 2FA is disabled
When an admins disable 2FA for users, we were sending two mails
to them, one notifying that 2FA was disabled and the other to notify
that WebAuthn was disabled.
As the second one is redundant since the first email includes it, we can
remove it and send just one email to users.
* refactor: avoid creating new env variable for webauthn_origin config
* refactor: improve flash error messages for webauthn pages
Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com>
2020-08-24 16:46:27 +02:00
dependabot[bot]
9b2648b30a
Bump simplecov from 0.18.5 to 0.19.0 ( #14590 )
...
Bumps [simplecov](https://github.com/simplecov-ruby/simplecov ) from 0.18.5 to 0.19.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.18.5...v0.19.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-21 05:31:28 +09:00
dependabot[bot]
c5092f8b62
Bump webpacker from 5.1.1 to 5.2.0 ( #14586 )
...
Bumps [webpacker](https://github.com/rails/webpacker ) from 5.1.1 to 5.2.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.1.1...v5.2.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-21 05:23:52 +09:00
dependabot[bot]
36289b6a61
Bump redis-rack from 2.1.2 to 2.1.3 ( #14584 )
...
Bumps [redis-rack](http://redis-store.org/redis-rack ) from 2.1.2 to 2.1.3.
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-21 05:15:38 +09:00
dependabot[bot]
8ba7922639
Bump aws-sdk-s3 from 1.76.0 to 1.78.0 ( #14583 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.76.0 to 1.78.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-08-21 05:14:30 +09:00
dependabot[bot]
919a554efa
Bump bootsnap from 1.4.7 to 1.4.8 ( #14581 )
...
Bumps [bootsnap](https://github.com/Shopify/bootsnap ) from 1.4.7 to 1.4.8.
- [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.7...v1.4.8 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-21 05:11:37 +09:00
Thibaut Girka
74a9affdcc
Merge branch 'master' into glitch-soc/merge-upstream
2020-08-19 19:16:41 +02:00
dependabot[bot]
8930841716
Bump aws-partitions from 1.353.0 to 1.356.0 ( #14578 )
...
Bumps [aws-partitions](https://github.com/aws/aws-sdk-ruby ) from 1.353.0 to 1.356.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-partitions/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-08-17 03:37:55 +09:00
dependabot[bot]
55e07d9840
Bump tty-color from 0.5.1 to 0.5.2 ( #14547 )
...
Bumps [tty-color](https://github.com/piotrmurach/tty-color ) from 0.5.1 to 0.5.2.
- [Release notes](https://github.com/piotrmurach/tty-color/releases )
- [Changelog](https://github.com/piotrmurach/tty-color/blob/master/CHANGELOG.md )
- [Commits](https://github.com/piotrmurach/tty-color/compare/v0.5.1...v0.5.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-17 02:32:28 +09:00
dependabot[bot]
c3cb6b1151
Bump fugit from 1.3.6 to 1.3.8 ( #14548 )
...
Bumps [fugit](https://github.com/floraison/fugit ) from 1.3.6 to 1.3.8.
- [Release notes](https://github.com/floraison/fugit/releases )
- [Changelog](https://github.com/floraison/fugit/blob/master/CHANGELOG.md )
- [Commits](https://github.com/floraison/fugit/compare/v1.3.6...v1.3.8 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-17 02:29:34 +09:00
dependabot[bot]
c917b53c53
Bump pkg-config from 1.4.1 to 1.4.2 ( #14549 )
...
Bumps [pkg-config](https://github.com/ruby-gnome/pkg-config ) from 1.4.1 to 1.4.2.
- [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.1...1.4.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-17 02:25:21 +09:00
dependabot[bot]
24b8a7af41
Bump premailer from 1.12.1 to 1.13.1 ( #14544 )
...
Bumps [premailer](https://github.com/premailer/premailer ) from 1.12.1 to 1.13.1.
- [Release notes](https://github.com/premailer/premailer/releases )
- [Changelog](https://github.com/premailer/premailer/blob/master/CHANGELOG.md )
- [Commits](https://github.com/premailer/premailer/compare/v1.12.1...v1.13.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-17 02:24:46 +09:00
dependabot[bot]
fd31509c53
Bump chunky_png from 1.3.11 to 1.3.12 ( #14545 )
...
Bumps [chunky_png](https://github.com/wvanbergen/chunky_png ) from 1.3.11 to 1.3.12.
- [Release notes](https://github.com/wvanbergen/chunky_png/releases )
- [Changelog](https://github.com/wvanbergen/chunky_png/blob/master/CHANGELOG.rdoc )
- [Commits](https://github.com/wvanbergen/chunky_png/compare/v1.3.11...v1.3.12 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-17 02:22:35 +09:00