Merge remote-tracking branch 'upstream/pull/1707'

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 79bc0d10e8a50efe611136ac1c6329cd00c90c30..79d95f9d5af3e7bc91376002e0e3574997c28aa8 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -119,9 +119,10 @@ end
 
 # Needed in development as well so rake can see konacha tasks
 group :development, :test do
+  gem "capybara", "~> 2.13"
   gem "coveralls", :require => false
-  gem "factory_girl_rails"
+  gem "factory_bot_rails"
   gem "jshint"
-  #  gem "konacha"
   gem "poltergeist"
+  gem "puma", "~> 3.7"
 end