bundle

Gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 ruby '2.0.0'
 ruby '2.0.0'
 
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '~> 4.0.2'
+gem 'rails', '~> 4.0'
 
 
 # Use SCSS for stylesheets
 # Use SCSS for stylesheets
 gem 'sass-rails'
 gem 'sass-rails'

Gemfile.lock

@@ -47,7 +47,9 @@ GEM
     arel (4.0.2)
     arel (4.0.2)
     ast (1.1.0)
     ast (1.1.0)
     atomic (1.1.14)
     atomic (1.1.14)
-    bcrypt-ruby (3.1.2)
+    bcrypt (3.1.6)
+    bcrypt-ruby (3.1.5)
+      bcrypt (>= 3.1.3)
     better_errors (1.1.0)
     better_errors (1.1.0)
       coderay (>= 1.0.0)
       coderay (>= 1.0.0)
       erubis (>= 2.6.6)
       erubis (>= 2.6.6)
@@ -128,7 +130,7 @@ GEM
       lumberjack (~> 1.0)
       lumberjack (~> 1.0)
       pry (>= 0.9.12)
       pry (>= 0.9.12)
       thor (>= 0.18.1)
       thor (>= 0.18.1)
-    guard-rspec (4.2.6)
+    guard-rspec (4.2.7)
       guard (~> 2.1)
       guard (~> 2.1)
       rspec (>= 2.14, < 4.0)
       rspec (>= 2.14, < 4.0)
     guard-rubocop (1.0.2)
     guard-rubocop (1.0.2)
@@ -155,7 +157,7 @@ GEM
     launchy (2.4.2)
     launchy (2.4.2)
       addressable (~> 2.3)
       addressable (~> 2.3)
     libv8 (3.16.14.3)
     libv8 (3.16.14.3)
-    listen (2.5.0)
+    listen (2.6.0)
       celluloid (>= 0.15.2)
       celluloid (>= 0.15.2)
       celluloid-io (>= 0.15.0)
       celluloid-io (>= 0.15.0)
       rb-fsevent (>= 0.9.3)
       rb-fsevent (>= 0.9.3)
@@ -372,7 +374,7 @@ DEPENDENCIES
   premailer
   premailer
   pry-rails
   pry-rails
   rack-mini-profiler
   rack-mini-profiler
-  rails (~> 4.0.2)
+  rails (~> 4.0)
   redcarpet!
   redcarpet!
   rspec-rails
   rspec-rails
   rubocop
   rubocop