diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2017-03-25 13:01:11 -0400 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2017-03-26 20:29:41 -0400 |
| commit | 7d751853e9691e0f2de8839cd594085f9e041917 (patch) | |
| tree | 8c6cb37996cf3c654aa78112ab800ebb7baa50ae | |
| parent | ce906f48a5fa7cd7748018c0c17d0d82d86baa44 (diff) | |
| download | gitlab-ce-7d751853e9691e0f2de8839cd594085f9e041917.tar.gz | |
Update webmock 1.21.0 -> 1.24.6
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 6 |
2 files changed, 5 insertions, 3 deletions
@@ -322,7 +322,7 @@ group :test do gem 'shoulda-matchers', '~> 2.8.0', require: false gem 'email_spec', '~> 1.6.0' gem 'json-schema', '~> 2.6.2' - gem 'webmock', '~> 1.21.0' + gem 'webmock', '~> 1.24.0' gem 'test_after_commit', '~> 1.1' gem 'sham_rack', '~> 1.3.6' gem 'timecop', '~> 0.8.0' diff --git a/Gemfile.lock b/Gemfile.lock index f90620169b7..3168bc0d680 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -343,6 +343,7 @@ GEM temple (~> 0.7.6) thor tilt + hashdiff (0.3.2) hashie (3.5.5) health_check (2.6.0) rails (>= 4.0) @@ -818,9 +819,10 @@ GEM vmstat (2.3.0) warden (1.2.6) rack (>= 1.0) - webmock (1.21.0) + webmock (1.24.6) addressable (>= 2.3.6) crack (>= 0.3.2) + hashdiff webpack-rails (0.9.9) rails (>= 3.2.0) websocket-driver (0.6.3) @@ -1023,7 +1025,7 @@ DEPENDENCIES version_sorter (~> 2.1.0) virtus (~> 1.0.1) vmstat (~> 2.3.0) - webmock (~> 1.21.0) + webmock (~> 1.24.0) webpack-rails (~> 0.9.9) wikicloth (= 0.8.1) |