Permalink
Commits on Aug 24, 2011
  1. Merge remote branch 'upstream/master'

    Conflicts:
    	lib/paperclip/upfile.rb
    	paperclip.gemspec
    committed Aug 24, 2011
Commits on Aug 23, 2011
  1. Update the travis build image to display the build result from master…

    … branch only
    
    This will prevent someone to think that Paperclip test suite for master branch is currently failing, as the build was failed on a WIP branch, not the main branch.
    
    http://travis-ci.org/#!/thoughtbot/paperclip/builds.
    sikachu committed Aug 23, 2011
  2. Revert "Revert "Handle interpolation of string IDs (supports mongo) a…

    …s well as integers""
    
    I think it's OK to have the bugfix for MongoDB in the plugin.
    
    This reverts commit cde2256.
    sikachu committed Aug 17, 2011
Commits on Aug 20, 2011
  1. Typo

    gabebw committed Aug 20, 2011
Commits on Aug 19, 2011
  1. Merge pull request #562 from chrisharper/more_travis

    Add rubinius to travis testing
    jyurek committed Aug 19, 2011
  2. Add rubinius

    Bump rails 3_1 version to rc6
    Chris Harper committed Aug 19, 2011
Commits on Aug 16, 2011
  1. Revert "Handle interpolation of string IDs (supports mongo) as well a…

    …s integers"
    
    This reverts commit fe01ae6.
    Harold Giménez committed Aug 16, 2011
Commits on Aug 15, 2011
  1. Follow the example with #avatar

    Harold Gim��nez committed Aug 15, 2011
  2. Typo

    Harold Gim��nez committed Aug 15, 2011
  3. Detaching a file

    Harold Gim��nez committed Aug 15, 2011
Commits on Aug 13, 2011
  1. Stop testing with JRuby, but start testing with REE

    It seems like that JRuby on travis-ci is broken[1], so we shouldn't test against it to reduce the false-positive result. I've run the test locally, and it passed just fine[2].
    
    [1]: http://travis-ci.org/#!/thoughtbot/paperclip/builds/79181
    [2]: https://gist.github.com/299686b412f9ad878e16
    sikachu committed Aug 13, 2011
Commits on Aug 12, 2011
  1. Fix typo in 0206259. Thanks @dolzenko

    sikachu committed Aug 12, 2011
Commits on Aug 5, 2011
  1. Update Travis to test on JRuby

    sikachu committed Aug 5, 2011
  2. Update Gemfile to make sure we can run the test locally, and also upg…

    …rade Rails 3.1 beta to latest version
    sikachu committed Aug 5, 2011
Commits on Aug 2, 2011
Commits on Jul 30, 2011
  1. use the correct gemfiles

    nickrivadeneira committed Jul 30, 2011
Commits on Jul 29, 2011
  1. Bump to 2.3.16

    sikachu committed Jul 29, 2011
  2. Refactor code just a little bit

    sikachu committed Jul 29, 2011
  3. Fixing issue #534 (now it works on Rails 2.3.8)

    Closes #534, closes #538
    aya-soft committed with sikachu Jul 27, 2011
Commits on Jul 28, 2011
Commits on Jul 26, 2011