Permalink
Commits on Jan 17, 2013
  1. Bumped version to 0.3.1

    rmm5t committed Jan 17, 2013
  2. Refactored serializable_hash

    Better matches the activerecord adapter in carrierwave core
    rmm5t committed Jan 17, 2013
Commits on Jan 16, 2013
Commits on Jan 15, 2013
  1. Removed extra puts in the specs

    rmm5t committed Jan 15, 2013
  2. Merge pull request #81 from peteonrails/master

    Fix to_json / serializable hash issue when using two uploaders on the same model.
    rmm5t committed Jan 15, 2013
  3. Correctly serialize JSON for two separate uplaoders on the same model.

    1. Added two failing tests that illustrate the problem.
    2. Fixed issue by changing serializable hash to use column.to_sym instead of string interpolation (which overwrites the method definition at the time mount_uploader is called)
    3. Fix an unrelated issue that caused my tests to fail: check that options are defined before sending :[] (which nil doesn't repond to)
    peteonrails committed Jan 15, 2013
  4. Merge branch 'mongoid-3.0'

    * mongoid-3.0:
      Get JRuby green, run Travis on this branch
      Get JRuby running green on this branch
    rmm5t committed Jan 15, 2013
  5. Merge pull request #56 from petergoldstein/feature/jruby_and_travis_i…

    …n_mongoid_3_0
    
    JRuby compatibility and Travis integration for existing Mongoid 3.0 branch
    rmm5t committed Jan 15, 2013
  6. Revert "Add additional note on upgrade procedure"

    This reverts commit 43d0ff0. The
    information was already available in the version differences section of
    the readme.
    rmm5t committed Jan 15, 2013
  7. Merge pull request #60 from hwatkins/upgrade_note

    Add additional note on upgrade procedure
    rmm5t committed Jan 15, 2013
  8. Removed grid_fs_connection config from README

    The connection config is unnecessary with mongoid-grid_fs
    rmm5t committed Jan 15, 2013
Commits on Dec 16, 2012
  1. Bumped version to 0.3.0

    rmm5t committed Dec 16, 2012
  2. Merge remote-tracking branch 'sferik/update_mongoid-grid_fs'

    # By Erik Michaels-Ober
    # Via Erik Michaels-Ober
    * sferik/update_mongoid-grid_fs:
      Specify runtime dependencies > 1.0 with 2 digits of precision
      Update rake dependency to version ~> 10.0
      Update mongoid-grid_fs dependency to version ~> 1.7.0
    
    # Please enter a commit message to explain why this merge is necessary,
    # especially if it merges an updated upstream into a topic branch.
    #
    # Lines starting with '#' will be ignored, and an empty message aborts
    # the commit.
    rmm5t committed Dec 16, 2012
  3. Specify runtime dependencies > 1.0 with 2 digits of precision

    Assume dependencies follow semantic versioning best practices.
    sferik committed Dec 16, 2012
  4. Revert "Added fix Mongoid 3's signature change of `for_ids`"

    This reverts commit 2c7a185.
    rmm5t committed Dec 16, 2012
  5. Merge remote-tracking branch 'bobbyw/patch-1'

    # By Bobby Wilson
    # Via Bobby Wilson
    * bobbyw/patch-1:
      bump carrierwave version
    
    Conflicts:
    	carrierwave-mongoid.gemspec
    rmm5t committed Dec 16, 2012
  6. Merge branch 'mongoid-3.0'

    # By ahoward (7) and others
    # Via Ryan McGeary (2) and volmer (1)
    * mongoid-3.0:
      It works with CarrierWave 0.6 and greater
      Updated Carrierwave to version 0.7.0
      zero config
      namespacing and version bumping.
      sigh.  i am not positive about the correct default config...
      typo
      update deps
      update README.md
      teh specs pass.
      Upped mongoid dependency to 3.0.0
      Updated Mongoid's `store_in` syntax
      Switched to using Mongoid's new test connection interface
      Upped mongoid dependency to ~> 3.0.0.rc
      Bumped version in prep for Mongoid 3.0 support
    
    Conflicts:
    	README.md
    rmm5t committed Dec 16, 2012
Commits on Dec 14, 2012
  1. bump carrierwave version

    bobbywilson0 committed Dec 14, 2012
Commits on Nov 19, 2012
  1. Merge pull request #68 from volmer/mongoid-3.0

    Updated Carrierwave to version 0.7.0
    rmm5t committed Nov 19, 2012
Commits on Nov 7, 2012
Commits on Oct 30, 2012
Commits on Sep 24, 2012
  1. Merge pull request #58 from Exoth/master

    Identity map + carrierwave-mongoid problem
    rmm5t committed Sep 24, 2012
Commits on Sep 18, 2012
  1. Add additional note on upgrade procedure

    Hugh Watkins committed Sep 18, 2012
Commits on Sep 13, 2012
Commits on Aug 9, 2012
Commits on Jul 27, 2012