aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>2021-03-01 23:36:45 +0900
committerGitHub <noreply@github.com>2021-03-01 23:36:45 +0900
commit9ff5338508f6e0a08a65f587da9c47b72fc75e31 (patch)
tree595b414a9a058d6772d8fedb2cc706ec8ad4db07
parenta65ff30b2abd1a58e0c950d8b4d15d2072897b6d (diff)
downloadmastodon-9ff5338508f6e0a08a65f587da9c47b72fc75e31.tar
mastodon-9ff5338508f6e0a08a65f587da9c47b72fc75e31.tar.gz
mastodon-9ff5338508f6e0a08a65f587da9c47b72fc75e31.tar.bz2
mastodon-9ff5338508f6e0a08a65f587da9c47b72fc75e31.zip
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>
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
2 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index 528a5e241..e9b90a147 100644
--- a/Gemfile
+++ b/Gemfile
@@ -124,7 +124,7 @@ group :test do
gem 'rails-controller-testing', '~> 1.0'
gem 'rspec-sidekiq', '~> 3.1'
gem 'simplecov', '~> 0.21', require: false
- gem 'webmock', '~> 3.11'
+ gem 'webmock', '~> 3.12'
gem 'parallel_tests', '~> 3.4'
gem 'rspec_junit_formatter', '~> 0.4'
end
diff --git a/Gemfile.lock b/Gemfile.lock
index d7375bf15..17776c791 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -664,7 +664,7 @@ GEM
safety_net_attestation (~> 0.4.0)
securecompare (~> 1.0)
tpm-key_attestation (~> 0.9.0)
- webmock (3.11.2)
+ webmock (3.12.0)
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
@@ -813,7 +813,7 @@ DEPENDENCIES
twitter-text (~> 1.14)
tzinfo-data (~> 1.2021)
webauthn (~> 3.0.0.alpha1)
- webmock (~> 3.11)
+ webmock (~> 3.12)
webpacker (~> 5.2)
webpush
xorcist (~> 1.1)