diff options
| author | Matthew Draper <matthew@trebex.net> | 2017-05-09 01:12:58 +0930 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-09 01:12:58 +0930 |
| commit | 943efa30f5475f51fe90df5f85703d191dbd7d6e (patch) | |
| tree | 9865fbd7c74f6b0632d68025ed0ff2b0d3ef96b4 /Gemfile.lock | |
| parent | 3f4eeb6dbab04bbc2608aaf51502327cc2d7e62b (diff) | |
| parent | 673a5644ace7a0cdb814f68026224ff843ccb221 (diff) | |
| download | rails-943efa30f5475f51fe90df5f85703d191dbd7d6e.tar.gz rails-943efa30f5475f51fe90df5f85703d191dbd7d6e.tar.bz2 rails-943efa30f5475f51fe90df5f85703d191dbd7d6e.zip | |
Merge pull request #28995 from jcoyne/update_capybara
Allow capybara minor releases
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index d516d52a4c..ad0ec7be0c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -91,7 +91,7 @@ PATH GEM remote: https://rubygems.org/ specs: - addressable (2.5.0) + addressable (2.5.1) public_suffix (~> 2.0, >= 2.0.2) amq-protocol (2.1.0) ast (2.3.0) @@ -125,7 +125,7 @@ GEM bunny (2.6.2) amq-protocol (>= 2.0.1) byebug (9.0.6) - capybara (2.13.0) + capybara (2.14.0) addressable mime-types (>= 1.16) nokogiri (>= 1.3.3) @@ -226,11 +226,11 @@ GEM mysql2 (0.4.6-x64-mingw32) mysql2 (0.4.6-x86-mingw32) nio4r (2.0.0) - nokogiri (1.7.0.1) + nokogiri (1.7.1) mini_portile2 (~> 2.1.0) - nokogiri (1.7.0.1-x64-mingw32) + nokogiri (1.7.1-x64-mingw32) mini_portile2 (~> 2.1.0) - nokogiri (1.7.0.1-x86-mingw32) + nokogiri (1.7.1-x86-mingw32) mini_portile2 (~> 2.1.0) parser (2.4.0.0) ast (~> 2.2) @@ -383,7 +383,7 @@ DEPENDENCIES blade blade-sauce_labs_plugin byebug - capybara (~> 2.13.0) + capybara (~> 2.13) coffee-rails dalli (>= 2.2.1) delayed_job |