From 0befd6474d3a727e340cf137077e172af935560a Mon Sep 17 00:00:00 2001
From: yafeilee <lyfi2003@gmail.com>
Date: Tue, 3 Mar 2015 00:03:59 +0800
Subject: [PATCH] fix #7 issue: rake assets:precompile error

---
 Gemfile      |  6 ++--
 Gemfile.lock | 79 ++++++++++++++++++++++++++--------------------------
 2 files changed, 43 insertions(+), 42 deletions(-)

diff --git a/Gemfile b/Gemfile
index 78facc9..9bd041c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,13 +4,13 @@ else
   source 'https://rubygems.org'
 end
 
-gem 'rails', '4.1.8'
+gem 'rails', '4.1.9'
 #gem 'sprockets', '2.12.1'
-gem 'sass-rails', '~> 4.0.4'
+gem 'sass-rails'
 gem 'coffee-rails', '~> 4.1.0'
 gem 'uglifier', '>= 1.3.0'
 gem 'jquery-rails'
-gem 'foundation-rails', '~> 5.4'
+gem 'foundation-rails', '~> 5.5.1'
 gem 'foundation-icons-sass-rails'
 gem 'font-awesome-sass'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 56a30ff..02a4b93 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,33 +1,33 @@
 GEM
   remote: http://ruby.taobao.org/
   specs:
-    actionmailer (4.1.8)
-      actionpack (= 4.1.8)
-      actionview (= 4.1.8)
+    actionmailer (4.1.9)
+      actionpack (= 4.1.9)
+      actionview (= 4.1.9)
       mail (~> 2.5, >= 2.5.4)
-    actionpack (4.1.8)
-      actionview (= 4.1.8)
-      activesupport (= 4.1.8)
+    actionpack (4.1.9)
+      actionview (= 4.1.9)
+      activesupport (= 4.1.9)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    actionview (4.1.8)
-      activesupport (= 4.1.8)
+    actionview (4.1.9)
+      activesupport (= 4.1.9)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-    activemodel (4.1.8)
-      activesupport (= 4.1.8)
+    activemodel (4.1.9)
+      activesupport (= 4.1.9)
       builder (~> 3.1)
-    activerecord (4.1.8)
-      activemodel (= 4.1.8)
-      activesupport (= 4.1.8)
+    activerecord (4.1.9)
+      activemodel (= 4.1.9)
+      activesupport (= 4.1.9)
       arel (~> 5.0.0)
-    activesupport (4.1.8)
+    activesupport (4.1.9)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
-    angularjs-rails (1.3.10)
+    angularjs-rails (1.3.14)
     arel (5.0.1.20140414130214)
     bson (2.3.0)
     builder (3.2.2)
@@ -49,7 +49,7 @@ GEM
     celluloid (0.16.0)
       timers (~> 4.0.0)
     chunky_png (1.3.4)
-    codeclimate-test-reporter (0.4.6)
+    codeclimate-test-reporter (0.4.7)
       simplecov (>= 0.7.1, < 1.0.0)
     coderay (1.1.0)
     coffee-rails (4.1.0)
@@ -79,9 +79,9 @@ GEM
     foundation-icons-sass-rails (3.0.0)
       railties (>= 3.1.1)
       sass-rails (>= 3.1.1)
-    foundation-rails (5.5.0.0)
+    foundation-rails (5.5.1.0)
       railties (>= 3.1.0)
-      sass (>= 3.2.0, < 3.4)
+      sass (>= 3.3.0, < 3.5)
     guard (2.12.4)
       formatador (>= 0.2.4)
       listen (~> 2.7)
@@ -174,19 +174,19 @@ GEM
     rack-cors (0.3.1)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.1.8)
-      actionmailer (= 4.1.8)
-      actionpack (= 4.1.8)
-      actionview (= 4.1.8)
-      activemodel (= 4.1.8)
-      activerecord (= 4.1.8)
-      activesupport (= 4.1.8)
+    rails (4.1.9)
+      actionmailer (= 4.1.9)
+      actionpack (= 4.1.9)
+      actionview (= 4.1.9)
+      activemodel (= 4.1.9)
+      activerecord (= 4.1.9)
+      activesupport (= 4.1.9)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.8)
+      railties (= 4.1.9)
       sprockets-rails (~> 2.0)
-    railties (4.1.8)
-      actionpack (= 4.1.8)
-      activesupport (= 4.1.8)
+    railties (4.1.9)
+      actionpack (= 4.1.9)
+      activesupport (= 4.1.9)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     raindrops (0.13.0)
@@ -228,12 +228,13 @@ GEM
       rspec (~> 3.0, >= 3.0.0)
       sidekiq (>= 2.4.0)
     rspec-support (3.2.2)
-    sass (3.2.19)
-    sass-rails (4.0.5)
+    sass (3.4.13)
+    sass-rails (5.0.1)
       railties (>= 4.0.0, < 5.0)
-      sass (~> 3.2.2)
-      sprockets (~> 2.8, < 3.0)
-      sprockets-rails (~> 2.0)
+      sass (~> 3.1)
+      sprockets (>= 2.8, < 4.0)
+      sprockets-rails (>= 2.0, < 4.0)
+      tilt (~> 1.1)
     shellany (0.0.1)
     sidekiq (3.3.2)
       celluloid (>= 0.16.0)
@@ -259,7 +260,7 @@ GEM
       railties (>= 3.1, < 5.0)
       slim (~> 3.0)
     slop (3.6.0)
-    spring (1.3.2)
+    spring (1.3.3)
     sprockets (2.12.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -277,7 +278,7 @@ GEM
       hitimes
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uglifier (2.7.0)
+    uglifier (2.7.1)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     unicorn (4.8.3)
@@ -302,7 +303,7 @@ DEPENDENCIES
   figaro
   font-awesome-sass
   foundation-icons-sass-rails
-  foundation-rails (~> 5.4)
+  foundation-rails (~> 5.5.1)
   guard
   guard-bundler
   guard-rails
@@ -321,14 +322,14 @@ DEPENDENCIES
   pry-rails
   quiet_assets
   rack-cors
-  rails (= 4.1.8)
+  rails (= 4.1.9)
   redcarpet
   rest-client
   rouge
   rqrcode-with-patches
   rspec-rails (>= 2.8.1)
   rspec-sidekiq
-  sass-rails (~> 4.0.4)
+  sass-rails
   sidekiq
   simple_form
   slim-rails