fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-01 00:51:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
13047 commits 135 branches 266 tags 973 MiB
Commit graph

1261 commits

Author SHA1 Message Date
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
dependabot[bot] f74c373663
Bump rdf from 3.1.4 to 3.1.5 (#14543) 
Bumps [rdf](https://github.com/ruby-rdf/rdf) from 3.1.4 to 3.1.5.
- [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.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-08-17 02:21:52 +09:00
dependabot[bot] f5b87ac4db
Bump aws-sdk-s3 from 1.75.0 to 1.76.0 (#14542) 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.75.0 to 1.76.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-17 02:18:25 +09:00
dependabot[bot] 8a9d9509ec
Bump brakeman from 4.8.2 to 4.9.0 (#14540) 
Bumps [brakeman](https://github.com/presidentbeef/brakeman) from 4.8.2 to 4.9.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.8.2...v4.9.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-08-17 02:17:00 +09:00
dependabot[bot] 4d67df6155
Bump concurrent-ruby from 1.1.6 to 1.1.7 (#14539) 
Bumps [concurrent-ruby](https://github.com/ruby-concurrency/concurrent-ruby) from 1.1.6 to 1.1.7.
- [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.6...v1.1.7)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-08-17 02:16:12 +09:00
ThibG a55ad84251
Remove dependency on unused and unmaintained http_parser.rb gem (#14574) 
It seems that years ago, the “http” gem dependend on the “http_parser.rb” gem
(it now depends on the “http-parser” gem), and, still years ago, we pulled
it from git in order to benefit from a bugfix that wasn't released yet (#7467).
 2020-08-14 18:04:00 +02:00
Thibaut Girka 5d5b9e2f62 Merge branch 'master' into glitch-soc/merge-upstream 2020-08-08 19:10:40 +02:00
dependabot[bot] c1c0a0e3a2
Bump excon from 0.75.0 to 0.76.0 (#14490) 
Bumps [excon](https://github.com/excon/excon) from 0.75.0 to 0.76.0.
- [Release notes](https://github.com/excon/excon/releases)
- [Changelog](https://github.com/excon/excon/blob/master/changelog.txt)
- [Commits](https://github.com/excon/excon/compare/v0.75.0...v0.76.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-08-07 00:35:32 +09:00
dependabot[bot] a61329199e
Bump pghero from 2.6.0 to 2.7.0 (#14518) 
Bumps [pghero](https://github.com/ankane/pghero) from 2.6.0 to 2.7.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.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-08-07 00:34:12 +09:00
dependabot[bot] 63bbe6cab8
Bump rubocop-ast from 0.2.0 to 0.3.0 (#14498) 
Bumps [rubocop-ast](https://github.com/rubocop-hq/rubocop-ast) from 0.2.0 to 0.3.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.2.0...v0.3.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-08-05 05:31:57 +09:00
dependabot[bot] 3cd76411d2
Bump elasticsearch from 7.8.0 to 7.8.1 (#14501) 
Bumps [elasticsearch](https://github.com/elastic/elasticsearch-ruby) from 7.8.0 to 7.8.1.
- [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.0...v7.8.1)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-08-05 05:30:54 +09:00
dependabot[bot] 97afc88764
Bump aws-partitions from 1.345.0 to 1.349.0 (#14489) 
Bumps [aws-partitions](https://github.com/aws/aws-sdk-ruby) from 1.345.0 to 1.349.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-05 05:24:03 +09:00
Thibaut Girka 2cfa142961 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `yarn.lock`:
  No real conflict, just a glitch-soc-only dependency textually too close to
  one updated upstream. Ported upstream changes.
 2020-08-01 20:24:23 +02:00
dependabot[bot] 4f2b06b6b5
Bump strong_migrations from 0.6.8 to 0.7.1 (#14463) 
Bumps [strong_migrations](https://github.com/ankane/strong_migrations) from 0.6.8 to 0.7.1.
- [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.6.8...v0.7.1)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-07-29 02:18:59 +09:00
dependabot[bot] 3f94572a88
Bump posix-spawn from 58465d2e213991f8afb13b984854a49fcdcc980c to 0.3.15 (#14433) 
Bumps [posix-spawn](https://github.com/rtomayko/posix-spawn) from 58465d2e213991f8afb13b984854a49fcdcc980c to 0.3.15. This release includes the previously tagged commit.
- [Release notes](https://github.com/rtomayko/posix-spawn/releases)
- [Commits](58465d2e21...v0.3.15)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-07-29 00:59:29 +09:00
dependabot[bot] 87a058c8e0
Bump sidekiq from 6.1.0 to 6.1.1 (#14427) 
Bumps [sidekiq](https://github.com/mperham/sidekiq) from 6.1.0 to 6.1.1.
- [Release notes](https://github.com/mperham/sidekiq/releases)
- [Changelog](https://github.com/mperham/sidekiq/blob/master/Changes.md)
- [Commits](https://github.com/mperham/sidekiq/compare/v6.1.0...v6.1.1)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-07-29 00:54:00 +09:00
dependabot[bot] 93c3d04254
Bump tty-prompt from 0.21.0 to 0.22.0 (#14430) 
Bumps [tty-prompt](https://github.com/piotrmurach/tty-prompt) from 0.21.0 to 0.22.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.21.0...v0.22.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-07-29 00:51:15 +09:00