Merge branch 'quiet_assets' into rails-3-develop

2 files changed, 4 insertions, 0 deletions

diff --git a/Gemfile b/Gemfile
index fa6c39262..b79d0c145 100644
--- a/Gemfile
+++ b/Gemfile
@@ -82,6 +82,7 @@ end
 group :development do
   gem 'capistrano'
   gem 'mailcatcher'
+  gem 'quiet_assets'
   gem 'rdoc'
 end
 
diff --git a/Gemfile.lock b/Gemfile.lock
index fd02983c0..ea5bce848 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -162,6 +162,8 @@ GEM
       railties (~> 3.0)
     pg (0.15.1)
     polyglot (0.3.4)
+    quiet_assets (1.0.2)
+      railties (>= 3.1, < 5.0)
     rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
@@ -312,6 +314,7 @@ DEPENDENCIES
   newrelic_rpm
   nokogiri
   pg
+  quiet_assets
   rack
   rails (= 3.2.18)
   rails-i18n