From e36483550d401945e3883b7807e4b78da8cd9eb3 Mon Sep 17 00:00:00 2001
From: albert <r888888888@gmail.com>
Date: Fri, 10 Feb 2012 17:55:05 -0500
Subject: [PATCH] updated gems

---
 Gemfile      |  5 ++---
 Gemfile.lock | 42 +++++++++++++++++++++---------------------
 2 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/Gemfile b/Gemfile
index ece5c9ebb..e66773090 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,9 +9,8 @@ group :test do
 end
 
 group :assets do
-  gem "sass"
-  gem "uglifier"
-  gem "therubyracer"
+  gem "sass-rails", "~> 3.2.3"
+  gem "uglifier", ">= 1.0.3"
 end
 
 gem "rails", "3.2.1"
diff --git a/Gemfile.lock b/Gemfile.lock
index d426732ec..48c1d51c2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -12,9 +12,9 @@ GIT
 
 GIT
   remote: git://github.com/ernie/meta_search.git
-  revision: 5bfe8322ac3c56ed8c714c1892aebf1390e7db5e
+  revision: c7f084412c483456830b8ec26514991e17da94c7
   specs:
-    meta_search (1.1.2)
+    meta_search (1.1.3)
       actionpack (~> 3.1)
       activerecord (~> 3.1)
       activesupport (~> 3.1)
@@ -66,12 +66,12 @@ GEM
     arel (3.0.0)
     awesome_print (1.0.2)
     builder (3.0.0)
-    chronic (0.6.6)
+    chronic (0.6.7)
     coderay (1.0.5)
-    daemons (1.1.6)
+    daemons (1.1.8)
     delayed_job (3.0.1)
       activesupport (~> 3.0)
-    delayed_job_active_record (0.3.1)
+    delayed_job_active_record (0.3.2)
       activerecord (> 2.1.0)
       delayed_job (~> 3.0.0)
     domain_name (0.5.2)
@@ -79,13 +79,12 @@ GEM
     erubis (2.7.0)
     execjs (1.3.0)
       multi_json (~> 1.0)
-    factory_girl (2.5.0)
-      activesupport
+    factory_girl (2.5.2)
+      activesupport (>= 2.3.9)
     hike (1.2.1)
     i18n (0.6.0)
     journey (1.0.1)
     json (1.6.5)
-    libv8 (3.3.10.4)
     mail (2.4.1)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -94,21 +93,21 @@ GEM
     metaclass (0.0.1)
     method_source (0.7.0)
     mime-types (1.17.2)
-    mocha (0.10.3)
+    mocha (0.10.4)
       metaclass (~> 0.0.1)
     multi_json (1.0.4)
     net-http-digest_auth (1.2)
-    net-http-persistent (2.3.3)
+    net-http-persistent (2.5.1)
     nokogiri (1.5.0)
     ntlm-http (0.1.1)
-    pg (0.12.2)
+    pg (0.13.0)
     polyamorous (0.5.0)
       activerecord (~> 3.0)
     polyglot (0.3.3)
-    pry (0.9.8)
+    pry (0.9.8.2)
       coderay (~> 1.0.5)
       method_source (~> 0.7)
-      slop (>= 2.4.3, < 3)
+      slop (>= 2.4.4, < 3)
     rack (1.4.1)
     rack-cache (1.1)
       rack (>= 0.4)
@@ -135,7 +134,11 @@ GEM
     rdoc (3.12)
       json (~> 1.4)
     rmagick (2.13.1)
-    sass (3.1.12)
+    sass (3.1.15)
+    sass-rails (3.2.4)
+      railties (~> 3.2.0)
+      sass (>= 3.1.10)
+      tilt (~> 1.3)
     shoulda (2.11.3)
     silent-postgres (0.1.1)
     simple_form (1.5.2)
@@ -145,7 +148,7 @@ GEM
       multi_json (~> 1.0.3)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
-    slop (2.4.3)
+    slop (2.4.4)
     sprockets (2.1.2)
       hike (~> 1.2)
       rack (~> 1.0)
@@ -153,15 +156,13 @@ GEM
     super_exception_notifier (3.0.13)
       actionmailer
       rake
-    therubyracer (0.9.9)
-      libv8 (~> 3.3.10)
     thor (0.14.6)
     tilt (1.3.3)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.31)
-    uglifier (1.2.2)
+    uglifier (1.2.3)
       execjs (>= 0.3.0)
       multi_json (>= 1.0.2)
     unf (0.0.4)
@@ -192,12 +193,11 @@ DEPENDENCIES
   rails (= 3.2.1)
   rmagick
   sanitize!
-  sass
+  sass-rails (~> 3.2.3)
   shoulda
   silent-postgres
   simple_form
   simplecov
   super_exception_notifier
-  therubyracer
-  uglifier
+  uglifier (>= 1.0.3)
   whenever