diff --git a/Gemfile b/Gemfile index 5906ef8..5d8b6ae 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,7 @@ gem 'rails', '4.2.6' ruby '2.3.1' -gem 'rake', '10.5.0' # LOCKED DOWN UNTIL MOVE TO RSPEC beta2. +gem 'rake' # Bundle edge Rails instead: # gem 'rails', github: 'rails/rails' @@ -72,7 +72,7 @@ gem 'jquery-rails' # Pow related gem gem 'powder' -gem 'aruba', '0.9.0.pre' # LOCKED DOWN +gem 'aruba' #gem 'minitest', '~> 4.0', :require=> "minitest/autorun" #gem 'minitest' diff --git a/Gemfile.lock b/Gemfile.lock index 60b6856..8fd5027 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -38,7 +38,7 @@ GEM tzinfo (~> 1.1) addressable (2.4.0) arel (6.0.3) - aruba (0.9.0.pre) + aruba (0.14.1) childprocess (~> 0.5.6) contracts (~> 0.9) cucumber (>= 1.3.19) @@ -226,7 +226,7 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) raindrops (0.16.0) - rake (10.5.0) + rake (11.1.2) rb-fsevent (0.9.7) rb-inotify (0.9.7) ffi (>= 0.5.0) @@ -317,7 +317,7 @@ PLATFORMS ruby DEPENDENCIES - aruba (= 0.9.0.pre) + aruba bcrypt better_errors binding_of_caller @@ -344,7 +344,7 @@ DEPENDENCIES pry-rails rack-livereload rails (= 4.2.6) - rake (= 10.5.0) + rake rb-fsevent responders rspec-rails