From 21eb6ccf2af55e864598342685c2d0e33178dbd4 Mon Sep 17 00:00:00 2001
From: Dan Croak <dcroak@thoughtbot.com>
Date: Thu, 13 Aug 2009 22:49:40 -0400
Subject: [PATCH] making sure .gems and config/environment.rb are in sync, complete

---
 .gems                 |  3 +++
 config/environment.rb | 23 +++++++++++++++++++----
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/.gems b/.gems
index ab816eb..5bc9b4f 100644
--- a/.gems
+++ b/.gems
@@ -1,9 +1,12 @@
 ambethia-smtp-tls --version '1.1.2' --source gems.github.com
 tobi-delayed_job --version '1.7.0' --source gems.github.com
 tristandunn-paperclip --version '2.3.1' --source gems.github.com
+mime-types --version '1.16'
+xml-simple --version '1.0.12'
 aws-s3 --version '0.6.2'
 rubaidh-google_analytics --version '1.1.4' --source gems.github.com
 yfactorial-utility_scopes --version '0.2.2' --source gems.github.com
 justinfrench-formtastic --version '0.2.1' --source gems.github.com
 thoughtbot-clearance --version '0.7.0' --source gems.github.com
+josevalim-inherited_resources ==version='0.8.5' --source gems.github.com
 
diff --git a/config/environment.rb b/config/environment.rb
index 56a4ac4..cbf887e 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -21,12 +21,19 @@ Rails::Initializer.run do |config|
     :lib     => "delayed_job",
     :version => "1.7.0",
     :source  => "http://gems.github.com"
-  config.gem "thoughtbot-paperclip",
+  config.gem "tristandunn-paperclip",
     :lib     => "paperclip",
-    :version => "2.2.9.2",
+    :version => "2.3.1",
     :source  => "http://gems.github.com"
-  config.gem "right_aws",
-    :version => "1.10.0"
+  config.gem "mime-types",
+    :lib     => "mime/types",
+    :version => "1.16"
+  config.gem "xml-simple",
+    :lib     => "xmlsimple",
+    :version => "1.0.12"
+  config.gem "aws-s3",
+    :lib     => "aws/s3",
+    :version => "0.6.2"
   config.gem "yfactorial-utility_scopes",
     :lib     => "utility_scopes",
     :version => "0.2.2",
@@ -35,5 +42,13 @@ Rails::Initializer.run do |config|
     :lib     => 'formtastic', 
     :source  => 'http://gems.github.com',
     :version => '0.2.1'
+  config.gem "josevalim-inherited_resources", 
+    :lib     => 'inherited_resources', 
+    :source  => 'http://gems.github.com',
+    :version => '0.8.5'
+  config.gem "thoughtbot-clearance", 
+    :lib     => 'clearance', 
+    :source  => 'http://gems.github.com', 
+    :version => '0.7.0'
 end
 
--
libgit2 0.21.2