diff --git a/Gemfile b/Gemfile old mode 100755 new mode 100644 index 92a6415..d40a481 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'http://rubygems.org' gem 'rails', '4.1.4' -gem 'rake', '10.1.1' +gem 'rake', '12.3.3' gem 'sass-rails', '~> 4.0.3' gem 'uglifier', '>= 1.3.0' diff --git a/Gemfile.lock b/Gemfile.lock index b283db0..23b940a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -89,11 +89,6 @@ GEM coderay (~> 1.1.0) method_source (~> 0.8.1) slop (~> 3.4) - pry (0.10.0-i386-mingw32) - coderay (~> 1.1.0) - method_source (~> 0.8.1) - slop (~> 3.4) - win32console (~> 1.3) pry (0.10.0-x86-mingw32) coderay (~> 1.1.0) method_source (~> 0.8.1) @@ -117,7 +112,7 @@ GEM activesupport (= 4.1.4) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (10.1.1) + rake (12.3.3) rb-fsevent (0.9.4) rb-inotify (0.9.5) ffi (>= 0.5.0) @@ -175,7 +170,7 @@ DEPENDENCIES mysql2 (= 0.3.15) nilify_blanks rails (= 4.1.4) - rake (= 10.1.1) + rake (= 12.3.3) roo sass-rails (~> 4.0.3) tzinfo-data