Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: bryanl/paperclip
base: master
...
head fork: nono/paperclip
compare: master
Checking mergeability… Don’t worry, you can still create the pull request.
Commits on Apr 27, 2010
@jyurek jyurek The gemspec is a separate file which can handle itself. eefaa9c
@jyurek jyurek Added a rake task for testing all versions. Changed gem statements to…
… use ~> instead of hard versions.
21802b3
@jyurek jyurek Change stray logger usage to Paperclip.log 9283b5e
Commits on Apr 29, 2010
@hardbap hardbap :s3_credentials will now accept a Pathname
Rails.root returns a Pathname and you can now declare your attachment
without having to call #to_s first:

has_attached_file :avatar,
                  :storage => :s3,
                  :s3_credentials => Rails.root.join('s3.yml')
(cherry picked from commit 65d7600)
95fc7b6
@jyurek jyurek Changed rake :all_versions to :all b65ea24
Commits on May 01, 2010
@jyurek jyurek Changed Paperclip.run to take an array. Quotes this array for shell s…
…afety.
724cc7e
@jyurek jyurek Removed warnings about #errors in Rails 3 a4d1b0e
@jyurek jyurek Removed warnings about #errors in Rails 3 cdfefd6
Commits on May 14, 2010
@jyurek jyurek Moved AR include into a configure method to prevent non-inclusion whe…
…n using the git repo in the Gemfile
08f837f
Commits on May 17, 2010
@jyurek jyurek Moved generators to lib/generators which is picked up by rails3 43cbf82
@jyurek jyurek Added the gem itself to the .gitignore 7c3dd0f
Commits on May 18, 2010
@jyurek jyurek Removed the Rails20 callback compatibility module, since we're droppi…
…ng 2.0.* support
aa93dae
Commits on May 20, 2010
@jyurek jyurek Automatic initialization for Rails 2 and Rails 3 b9d9fc4
@jyurek jyurek Returned old generators for Rails 2 compatability. da994cf
Commits on May 24, 2010
@jyurek jyurek Made activerecord and activesupport 'real' dependencies. 87dfde6
@isaac isaac add rails dependencies without an underscore f0b5ac3
Commits on Jun 06, 2010
@nono nono Move the rake tasks in lib/tasks
(cherry picked from commit 4418c7a)
e766dd7
@nono nono Add a Railtie class, so we can load rake tasks
Oops, I forgot to regenerate the gemspec
Railtie_name was deprecared in Rails edge - See 395d664
f2ef8c4
Commits on Jun 07, 2010
@jyurek jyurek All generators working with Rails 2 and 3. Tested in app for Rails 2 …
…and 3.
c334c98
@jyurek jyurek Merge branch 'rails3' 6f8b31f
@jyurek jyurek Bump version to beta2 44124a5
@jyurek jyurek No more NotIdentifiedByImageMagick errors if IM is not in the path. G…
…ive a real error.

Based on a commit by Henrik N <henrik@nyh.se>
ecd369d
@jyurek jyurek Removed extraneous debugging puts. 3f1390a
@jyurek jyurek Also give a CommandNotFoundError if backtick raises Errno::ENOENT. 20e9559
@joshuaclayton joshuaclayton Fix spelling error a1de414
@joshuaclayton joshuaclayton Fix test assertion to not break in Ruby 1.9.1 980c9b9
@joshuaclayton joshuaclayton Clean up whitespace 3be55fc
Commits on Jun 08, 2010
@nragaz nragaz put version in its own file
(cherry picked from commit e053805f55b872e6926dfbfa14f38d1296e8b922)
bf33af3
@nragaz nragaz use ActiveSupport.on_load :active_record instead of an initializer
(cherry picked from commit 67865aac3227bd9c515052f6fbee446b4e724971)
7bd613a
@jyurek jyurek Merge branch 'master' of github.com:thoughtbot/paperclip 49df90b
@jyurek jyurek Beta3, looking good for actually working for everyone's rails3/bundler. bd45c4f
@jyurek jyurek Version 2.3.2 a3f7b1b
@jyurek jyurek Prevent error coercing nil -> Integer by explicit conversion. 1bcfc14
Commits on Jun 09, 2010
joeljunstrom Paperclip::Railtie.insert should be wrapped in a initializer block c4cf756
joeljunstrom Commiting things that breaks older rails is probbaly considered harmfull 3203025