Merged in upstream #62

jrgifford · Oct 11, 2012 · 45dd565 · 45dd565
2 parents 2e8f1cb + 98a8b9e
commit 45dd565
Show file tree

Hide file tree

Showing 11 changed files with 40 additions and 347 deletions.
diff --git a/Appraisals b/Appraisals
@@ -9,3 +9,8 @@ end
 appraise "rails3_1" do
   gem "rails", "~> 3.1.0"
 end
+
+appraise "rails3_2" do
+  gem "rails", "~> 3.2.0"
+  gem "delayed_job_active_record"
+end
diff --git a/Gemfile b/Gemfile
@@ -2,7 +2,7 @@ source "http://rubygems.org"
 
 gemspec
 
-gem "paperclip", '~>2.7'
+gem "paperclip", '~> 2.7'
 
 gem "appraisal"
 gem "mocha"
@@ -11,6 +11,5 @@ gem "json",         :platforms => :ruby_18
 
 gem "delayed_job",  :require => false
 gem "delayed_job_active_record", :require => false
-
 gem "resque",       :require => false
-
+gem "resque",       :require => false
diff --git a/gemfiles/rails2.gemfile b/gemfiles/rails2.gemfile
@@ -2,13 +2,14 @@
 
 source "http://rubygems.org"
 
-gem "paperclip", "2.5"
+gem "paperclip", "~> 2.7"
 gem "appraisal"
 gem "mocha"
 gem "sqlite3"
+gem "json", :platforms=>:ruby_18
 gem "delayed_job", :require=>false
+gem "delayed_job_active_record", :require=>false
 gem "resque", :require=>false
-gem "json", :platforms=>:ruby_18
 gem "rails", "~> 2.3.14"
 
 gemspec :path=>"../"
diff --git a/gemfiles/rails2.gemfile.lock b/gemfiles/rails2.gemfile.lock
diff --git a/gemfiles/rails3.gemfile b/gemfiles/rails3.gemfile
@@ -2,13 +2,14 @@
 
 source "http://rubygems.org"
 
-gem "paperclip", "2.5"
+gem "paperclip", "~> 2.7"
 gem "appraisal"
 gem "mocha"
 gem "sqlite3"
+gem "json", :platforms=>:ruby_18
 gem "delayed_job", :require=>false
+gem "delayed_job_active_record", :require=>false
 gem "resque", :require=>false
-gem "json", :platforms=>:ruby_18
 gem "rails", "~> 3.0.10"
 
 gemspec :path=>"../"
diff --git a/gemfiles/rails3.gemfile.lock b/gemfiles/rails3.gemfile.lock
diff --git a/gemfiles/rails3_1.gemfile b/gemfiles/rails3_1.gemfile
@@ -2,13 +2,14 @@
 
 source "http://rubygems.org"
 
-gem "paperclip", "2.5"
+gem "paperclip", "~> 2.7"
 gem "appraisal"
 gem "mocha"
 gem "sqlite3"
+gem "json", :platforms=>:ruby_18
 gem "delayed_job", :require=>false
+gem "delayed_job_active_record", :require=>false
 gem "resque", :require=>false
-gem "json", :platforms=>:ruby_18
 gem "rails", "~> 3.1.0"
 
 gemspec :path=>"../"