diff --git a/Gemfile b/Gemfile index 7320b3c6..6c8f4c1c 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'rails', '4.1.0' +gem 'rails', '4.1.4' gem 'rack-cors', :require => 'rack/cors' # Bundle edge Rails instead: @@ -18,7 +18,7 @@ group :assets do gem 'jquery-ui-rails' gem 'ember-source' #, github: 'emberjs/ember.js', require: 'ember/source' gem 'ember-rails' - gem 'sass-rails' #, '~> 4.0.2' + gem 'sass-rails', '~> 4.0.2' gem 'coffee-rails' #, '~> 3.2.1' #gem 'twitter-bootstrap-rails' # Only for mobile assets precompile, not used in this project diff --git a/Gemfile.lock b/Gemfile.lock index 1087c129..1263fa72 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: git://github.com/bterkuile/cmtool.git - revision: 98191722e04dc3bd8b96be347929215e7d7c9059 + revision: af57f9389245001e1a36e9c01383b031ca402e03 specs: cmtool (1.0.0) bourbon @@ -37,7 +37,7 @@ GIT GIT remote: git://github.com/bterkuile/simply_stored.git - revision: 7e29edef26f6e598c0804ba28929e2fad7045931 + revision: a4b672f68cbcf275aa10fc5014a3763238691956 specs: simply_stored (1.0.0) activesupport @@ -47,30 +47,30 @@ GIT GEM remote: https://rubygems.org/ specs: - actionmailer (4.1.0) - actionpack (= 4.1.0) - actionview (= 4.1.0) + actionmailer (4.1.4) + actionpack (= 4.1.4) + actionview (= 4.1.4) mail (~> 2.5.4) - actionpack (4.1.0) - actionview (= 4.1.0) - activesupport (= 4.1.0) + actionpack (4.1.4) + actionview (= 4.1.4) + activesupport (= 4.1.4) rack (~> 1.5.2) rack-test (~> 0.6.2) - actionview (4.1.0) - activesupport (= 4.1.0) + actionview (4.1.4) + activesupport (= 4.1.4) builder (~> 3.1) erubis (~> 2.7.0) active_decorator (0.3.4) active_model_serializers (0.8.1) activemodel (>= 3.0) - activemodel (4.1.0) - activesupport (= 4.1.0) + activemodel (4.1.4) + activesupport (= 4.1.4) builder (~> 3.1) - activerecord (4.1.0) - activemodel (= 4.1.0) - activesupport (= 4.1.0) + activerecord (4.1.4) + activemodel (= 4.1.4) + activesupport (= 4.1.4) arel (~> 5.0.0) - activesupport (4.1.0) + activesupport (4.1.4) i18n (~> 0.6, >= 0.6.9) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) @@ -158,7 +158,7 @@ GEM handlebars-source (> 1.0.0) jquery-rails (>= 1.0.17) railties (>= 3.1) - ember-source (1.5.1.1) + ember-source (1.6.0) handlebars-source (~> 1.0) emblem-rails (0.2.1) barber-emblem (~> 0.1.1) @@ -174,7 +174,7 @@ GEM railties (>= 3.0.0) faraday (0.9.0) multipart-post (>= 1.2, < 3) - faye (1.0.1) + faye (1.0.3) cookiejar (>= 0.3.0) em-http-request (>= 0.3.0) eventmachine (>= 0.12.0) @@ -233,7 +233,7 @@ GEM mini_magick (3.7.0) subexec (~> 0.2.1) mini_portile (0.6.0) - minitest (5.3.5) + minitest (5.4.0) multi_json (1.10.1) multi_xml (0.5.5) multipart-post (2.0.0) @@ -256,7 +256,7 @@ GEM oauth2 (~> 0.9.3) omniauth (~> 1.2) orm_adapter (0.5.0) - paperclip (4.1.1) + paperclip (4.2.0) activemodel (>= 3.0.0) activesupport (>= 3.0.0) cocaine (~> 0.5.3) @@ -274,24 +274,27 @@ GEM rack-cors (0.2.9) rack-test (0.6.2) rack (>= 1.0) - rails (4.1.0) - actionmailer (= 4.1.0) - actionpack (= 4.1.0) - actionview (= 4.1.0) - activemodel (= 4.1.0) - activerecord (= 4.1.0) - activesupport (= 4.1.0) + rails (4.1.4) + actionmailer (= 4.1.4) + actionpack (= 4.1.4) + actionview (= 4.1.4) + activemodel (= 4.1.4) + activerecord (= 4.1.4) + activesupport (= 4.1.4) bundler (>= 1.3.0, < 2.0) - railties (= 4.1.0) + railties (= 4.1.4) sprockets-rails (~> 2.0) - railties (4.1.0) - actionpack (= 4.1.0) - activesupport (= 4.1.0) + railties (4.1.4) + actionpack (= 4.1.4) + activesupport (= 4.1.4) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (10.3.2) - rest-client (1.6.7) - mime-types (>= 1.16) + rdoc (4.1.1) + json (~> 1.4) + rest-client (1.6.8) + mime-types (~> 1.16) + rdoc (>= 2.4.2) rqrcode (0.4.2) rspec (3.0.0) rspec-core (~> 3.0.0) @@ -414,10 +417,10 @@ DEPENDENCIES pry-rails quiet_assets rack-cors - rails (= 4.1.0) + rails (= 4.1.4) rqrcode rspec-rails - sass-rails + sass-rails (~> 4.0.2) simple_form simplecov simply_stored!