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: carrierwaveuploader/carrierwave-mongoid
base: v0.2.1
...
head fork: carrierwaveuploader/carrierwave-mongoid
compare: v0.3.1
Commits on May 12, 2012
@genexp genexp Adds some additional directions to the readme file bdc3263
@genexp genexp Fixes bad ctrl-c/ctrl-v c274f2e
Commits on May 14, 2012
@genexp genexp Fixes grammar! bf4df91
@rmm5t rmm5t Updated version information in the README 3fce922
Commits on May 15, 2012
@rmm5t rmm5t Merge pull request #43 from genexp/master
Small documentation upgrade.
fefb662
Commits on Jun 19, 2012
@rmm5t rmm5t Bumped version in prep for Mongoid 3.0 support 70270ff
@rmm5t rmm5t Upped mongoid dependency to ~> 3.0.0.rc
Also removed mongo and bson_ext dependencies
f26cb3c
@rmm5t rmm5t Switched to using Mongoid's new test connection interface 6a14124
@rmm5t rmm5t Updated Mongoid's `store_in` syntax ccbec88
Commits on Jun 20, 2012
@rmm5t rmm5t Updated README to better explain gridfs connection configurations 27cf151
Commits on Jul 11, 2012
@rmm5t rmm5t Upped mongoid dependency to 3.0.0 70d73e1
Commits on Jul 24, 2012
@ahoward ahoward teh specs pass. dfb0146
@ahoward ahoward update README.md 0a6d998
@ahoward ahoward update deps d0980b7
@ahoward ahoward typo e507f0c
@ahoward ahoward sigh. i am not positive about the correct default config... fa3829d
Commits on Jul 25, 2012
@ahoward ahoward namespacing and version bumping. babd6e9
Commits on Jul 27, 2012
@ahoward ahoward zero config 6aa3cd9
@rmm5t rmm5t Merge pull request #51 from ahoward/mongoid-3.0
zero config
28a9b71
@agerlic agerlic Respect options[:except] and options[:only] when passed to to_json c2ed3be
Commits on Aug 09, 2012
@petergoldstein petergoldstein Get JRuby running green on this branch bbd1fdf
@petergoldstein petergoldstein Get JRuby green, run Travis on this branch 0c3612a
Commits on Sep 13, 2012
@Exoth Exoth A fix for the bug of not removing old uploads when the identity map i…
…s enabled.
7260aaa
Commits on Sep 18, 2012
Hugh Watkins Add additional note on upgrade procedure 43d0ff0
Commits on Sep 24, 2012
@rmm5t rmm5t Merge pull request #58 from Exoth/master
Identity map + carrierwave-mongoid problem
369a6df
Commits on Oct 30, 2012
@volmer volmer Updated Carrierwave to version 0.7.0 787109c
Commits on Nov 07, 2012
@volmer volmer It works with CarrierWave 0.6 and greater 13baa2d
Commits on Nov 19, 2012
@rmm5t rmm5t Merge pull request #68 from volmer/mongoid-3.0
Updated Carrierwave to version 0.7.0
fb61fb9
Commits on Dec 14, 2012
@bobbywilson0 bobbywilson0 bump carrierwave version dd2a4f1
Commits on Dec 16, 2012
@rmm5t rmm5t 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
f9a831d
@rmm5t rmm5t Added fix Mongoid 3's signature change of `for_ids` 2c7a185
@rmm5t rmm5t Merge remote-tracking branch 'bobbyw/patch-1'
# By Bobby Wilson
# Via Bobby Wilson
* bobbyw/patch-1:
  bump carrierwave version

Conflicts:
	carrierwave-mongoid.gemspec
e77c770
@rmm5t rmm5t Revert "Added fix Mongoid 3's signature change of `for_ids`"
This reverts commit 2c7a185.
ba9c3eb
@sferik sferik Update mongoid-grid_fs dependency to version ~> 1.7.0 6f70d6c
@sferik sferik Update rake dependency to version ~> 10.0 b2c2fa7
@sferik sferik Specify runtime dependencies > 1.0 with 2 digits of precision
Assume dependencies follow semantic versioning best practices.
b3c15b0
@rmm5t rmm5t Fixed Mongoid 3's signature change of `for_ids` 78b793d
@rmm5t rmm5t 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.
eb8f9bc
@rmm5t rmm5t Bumped version to 0.3.0 a2a87e9
Commits on Jan 15, 2013
@rmm5t rmm5t Removed grid_fs_connection config from README
The connection config is unnecessary with mongoid-grid_fs
3a15b1d
@rmm5t rmm5t Merge pull request #60 from hwatkins/upgrade_note
Add additional note on upgrade procedure
41fcc23
@rmm5t rmm5t Revert "Add additional note on upgrade procedure"
This reverts commit 43d0ff0. The
information was already available in the version differences section of
the readme.
bc96594
@rmm5t rmm5t 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
b445a38
@rmm5t rmm5t Merge branch 'mongoid-3.0'
* mongoid-3.0:
  Get JRuby green, run Travis on this branch
  Get JRuby running green on this branch
4e8577d
@peteonrails peteonrails 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)
f977b5d
@rmm5t rmm5t Merge pull request #81 from peteonrails/master
Fix to_json / serializable hash issue when using two uploaders on the same model.
60d63a0
@rmm5t rmm5t Removed extra puts in the specs 18720bc
@rmm5t rmm5t Added details about version diffs in 0.3.x to readme c50ff5f
@rmm5t rmm5t Added mongodb service to .travis.yml c1a31fe
@rmm5t rmm5t Added travis-ci build status to readme ddc6d9f
Commits on Jan 16, 2013
@rmm5t rmm5t Added rubinius (1.9 mode) to build matrix f670175
Commits on Jan 17, 2013
@rmm5t rmm5t Refactored serializable_hash
Better matches the activerecord adapter in carrierwave core
2f2759f
@rmm5t rmm5t Removed email notifications from travis-ci 582cd14
@rmm5t rmm5t Bumped version to 0.3.1 dbbb312
Something went wrong with that request. Please try again.