aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2017-06-08 07:20:44 +0200
committerGitHub <noreply@github.com>2017-06-08 07:20:44 +0200
commitf1e42fe267342ffa4cea84cf09b0caaee733632c (patch)
tree22de9802a481ce52ee844b5c72b608db6021a816
parent831ef696b1a054ffd6dea26ce39fe58b14ae99f4 (diff)
parent3ab7483f471e0ca366ab85a2c57dbb65ebdb72fb (diff)
downloadrails-f1e42fe267342ffa4cea84cf09b0caaee733632c.tar.gz
rails-f1e42fe267342ffa4cea84cf09b0caaee733632c.tar.bz2
rails-f1e42fe267342ffa4cea84cf09b0caaee733632c.zip
Merge pull request #29388 from y-yagi/bump_capybara
Bundle capybara 2.14.1 that includes fix for Ruby warnings
-rw-r--r--Gemfile.lock4
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index cd0751a895..77eaa47cb8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -125,7 +125,7 @@ GEM
bunny (2.6.2)
amq-protocol (>= 2.0.1)
byebug (9.0.6)
- capybara (2.14.0)
+ capybara (2.14.1)
addressable
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
@@ -367,7 +367,7 @@ GEM
websocket-driver (0.6.4)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.2)
- xpath (2.0.0)
+ xpath (2.1.0)
nokogiri (~> 1.3)
PLATFORMS