fixing asset serving

nikolaiwarner · Sep 2, 2011 · 8da673e · 8da673e
1 parent 53eef09
commit 8da673e
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 2 deletions.
diff --git a/Gemfile b/Gemfile
@@ -23,4 +23,12 @@ end
 
 group :production, :staging do
   gem "pg"
+end
+
+# Gems used only for assets and not required
+# in production environments by default.
+group :assets do
+  gem 'sass-rails', "  ~> 3.1.0"
+  gem 'coffee-rails', "~> 3.1.0"
+  gem 'uglifier'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -36,13 +36,22 @@ GEM
     cancan (1.6.5)
     carrierwave (0.5.7)
       activesupport (~> 3.0)
+    coffee-rails (3.1.0)
+      coffee-script (>= 2.2.0)
+      railties (~> 3.1.0.rc1)
+    coffee-script (2.2.0)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.1.2)
     devise (1.4.4)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.0.3)
       warden (~> 1.0.3)
     diff-lcs (1.1.3)
     erubis (2.7.0)
     excon (0.6.5)
+    execjs (1.2.4)
+      multi_json (~> 1.0)
     fog (0.11.0)
       builder
       excon (~> 0.6.5)
@@ -53,7 +62,7 @@ GEM
       net-ssh (~> 2.1.4)
       nokogiri (~> 1.5.0)
       ruby-hmac
-    formatador (0.2.0)
+    formatador (0.2.1)
     haml (3.1.2)
     high_voltage (1.0.0)
     hike (1.2.1)
@@ -118,6 +127,10 @@ GEM
       rspec (~> 2.6.0)
     ruby-hmac (0.4.0)
     sass (3.1.7)
+    sass-rails (3.1.0)
+      actionpack (~> 3.1.0)
+      railties (~> 3.1.0)
+      sass (>= 3.1.4)
     sprockets (2.0.0)
       hike (~> 1.2)
       rack (~> 1.0)
@@ -132,6 +145,9 @@ GEM
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.29)
+    uglifier (1.0.2)
+      execjs (>= 0.3.0)
+      multi_json (>= 1.0.2)
     warden (1.0.5)
       rack (>= 1.0)
 
@@ -141,6 +157,7 @@ PLATFORMS
 DEPENDENCIES
   cancan
   carrierwave
+  coffee-rails (~> 3.1.0)
   devise
   fog
   haml
@@ -152,5 +169,7 @@ DEPENDENCIES
   rmagick
   rspec-rails (>= 2.4.1)
   sass
+  sass-rails (~> 3.1.0)
   sqlite3
   squeel
+  uglifier
diff --git a/config/environments/production.rb b/config/environments/production.rb
@@ -15,7 +15,7 @@
   config.assets.compress = true
 
   # Don't fallback to assets pipeline if a precompiled asset is missed
-  config.assets.compile = false
+  config.assets.compile = true
 
   # Generate digests for assets URLs
   config.assets.digest = true