Revert to initial changes

See : 33e41f2
rspec · Jul 20, 2018 · 65d85a3 · 65d85a3
1 parent ae334b5
commit 65d85a3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/Gemfile b/Gemfile
@@ -44,6 +44,7 @@ if RUBY_VERSION < '2.0.0'
   gem 'mime-types', '< 3'
 end
 
+
 # Capybara versions that support RSpec 3 only support RUBY_VERSION >= 1.9.3
 if RUBY_VERSION >= '1.9.3'
   if /5(\.|-)[1-9]\d*/ === RAILS_VERSION || "master" == RAILS_VERSION

diff --git a/Gemfile-rails-dependencies b/Gemfile-rails-dependencies
@@ -22,8 +22,6 @@ when /stable$/
   gem_list << 'actionview' if version > '4-0-stable'
   if RUBY_VERSION  >= "2.2"
     gem_list << 'puma' if version > '5-0-stable'
-  elsif RUBY_VERSION >= "1.9.3"
-    gem "puma", "~> 3.11.4"
   end
 
   gem_list.each do |rails_gem|
@@ -42,12 +40,8 @@ when nil, false, ""
 else
   gem "rails", version
 
-  if version >= '5-1-stable'
-    if RUBY_VERSION < "2.2"
-      gem "puma", "~> 3.11.4"
-    else
-      gem "puma"
-    end
+  if version >= '5-1-stable' && RUBY_VERSION  >= "2.2"
+    gem "puma"
   end
 end