Merge pull request #244 from jasnow/master
Upgraded 5 gems - Fixed #232 (loose-ends)
This commit is contained in:
@@ -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'
|
||||
|
||||
+7
-7
@@ -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)
|
||||
@@ -52,7 +52,7 @@ GEM
|
||||
rack (>= 0.9.0)
|
||||
binding_of_caller (0.7.2)
|
||||
debug_inspector (>= 0.0.1)
|
||||
brakeman (3.3.0)
|
||||
brakeman (3.3.1)
|
||||
builder (3.2.2)
|
||||
bundler-audit (0.5.0)
|
||||
bundler (~> 1.2)
|
||||
@@ -125,7 +125,7 @@ GEM
|
||||
guard (~> 2.8)
|
||||
guard-compat (~> 1.0)
|
||||
multi_json (~> 1.8)
|
||||
guard-rspec (4.7.1)
|
||||
guard-rspec (4.7.2)
|
||||
guard (~> 2.1)
|
||||
guard-compat (~> 1.1)
|
||||
rspec (>= 2.99.0, < 4.0)
|
||||
@@ -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)
|
||||
@@ -295,7 +295,7 @@ GEM
|
||||
rack (>= 1.0.0)
|
||||
thor (0.19.1)
|
||||
thread_safe (0.3.5)
|
||||
tilt (2.0.4)
|
||||
tilt (2.0.5)
|
||||
travis-lint (2.0.0)
|
||||
json
|
||||
turbolinks (2.5.3)
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user