aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile
diff options
context:
space:
mode:
authorEileen M. Uchitelle <eileencodes@users.noreply.github.com>2017-09-18 16:46:26 -0400
committerGitHub <noreply@github.com>2017-09-18 16:46:26 -0400
commit42d09f6b49da619952267b22bd8800d9b816886b (patch)
tree7d80fa1529ca0e7c11b31c642e9cf9a0ea55a533 /Gemfile
parente4017d0288fff13be9e97335c37ebbd30d1e94ea (diff)
parentba04b580c6e56e366b1b8e4ef003e9a0c1c419bb (diff)
downloadrails-42d09f6b49da619952267b22bd8800d9b816886b.tar.gz
rails-42d09f6b49da619952267b22bd8800d9b816886b.tar.bz2
rails-42d09f6b49da619952267b22bd8800d9b816886b.zip
Merge pull request #30638 from twalpole/capybara_server
Use the default Capybara registered puma server configuration
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index fda547fab2..c60241d447 100644
--- a/Gemfile
+++ b/Gemfile
@@ -15,7 +15,7 @@ gem "rake", ">= 11.1"
# be loaded after loading the test library.
gem "mocha", "~> 0.14", require: false
-gem "capybara", "~> 2.13"
+gem "capybara", "~> 2.15"
gem "rack-cache", "~> 1.2"
gem "jquery-rails"