diff options
| author | Eileen M. Uchitelle <eileencodes@users.noreply.github.com> | 2017-09-18 16:46:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-18 16:46:26 -0400 |
| commit | 42d09f6b49da619952267b22bd8800d9b816886b (patch) | |
| tree | 7d80fa1529ca0e7c11b31c642e9cf9a0ea55a533 /Gemfile.lock | |
| parent | e4017d0288fff13be9e97335c37ebbd30d1e94ea (diff) | |
| parent | ba04b580c6e56e366b1b8e4ef003e9a0c1c419bb (diff) | |
| download | rails-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.lock')
| -rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 787631ada5..fb18fdc14e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -490,7 +490,7 @@ DEPENDENCIES blade-sauce_labs_plugin bootsnap (>= 1.1.0) byebug - capybara (~> 2.13) + capybara (~> 2.15) coffee-rails dalli (>= 2.2.1) delayed_job |