Bump to 2.5.1

thoughtbot · Jan 27, 2012 · ec4793e · ec4793e
1 parent bc6ed16
commit ec4793e
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -0,0 +1,14 @@
+2012-01-20	Jon Yurek <jyurek@thoughtbot.com>
+
+	* lib/paperclip/railtie.rb (insert): Hide ActiveRecord-specific stuff in
+	the Railtie
+
+2012-01-18	Luke Griffiths <wlgriffiths@gmail.com>
+
+	* lib/paperclip/storage/s3.rb (self.extended),
+	test/storage/s3_live_test.rb, test/storage/s3_test.rb: Add S3 encryption
+
+2012-01-16	Jeremy McNevin <jeremy.mcnevin@thedolancompany.com> and ralph <ralph@rvdh.de>
+
+	* lib/paperclip/storage/fog.rb (flush_writes), fog_test.rb: Pass the
+	content type to Fog.
diff --git a/NEWS b/NEWS
@@ -1,3 +1,9 @@
+New in 2.5.1:
+
+* Feature: After we've computed the content type, pass it to Fog.
+* Feature: S3 encryption with the new :s3_server_side_encryption option.
+* Feature: Works without ActiveRecord, allowing for e.g. mongo backends.
+
 New in 2.5.0:
 
 * Performance: Only connect to S3 when absolutely needed.

diff --git a/lib/paperclip/version.rb b/lib/paperclip/version.rb
@@ -1,3 +1,3 @@
 module Paperclip
-  VERSION = "2.5.0" unless defined? Paperclip::VERSION
+  VERSION = "2.5.1" unless defined? Paperclip::VERSION
 end