summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Bump version to 2.0.2v2.0.2Michael Bleigh2013-02-261-1/+1
* Merge pull request #85 from cromulus/reinstant_symbolize_keysMichael Bleigh2013-02-262-7/+10
|\
| * reinstating symbolize keys in the to_hash method.Bill Cromie2013-02-262-7/+10
|/
* bump version 2.0.1v2.0.1Jerry Cheung2013-02-252-1/+6
* remove dangling VERSION fileJerry Cheung2013-02-251-1/+0
* Merge pull request #81 from matschaffer/issue/object_id-warning-77Jerry Cheung2013-02-182-13/+0
|\
| * Remove override of object_id #77Mat Schaffer2013-02-182-13/+0
|/
* Delete Gemfile.lock from repo.v2.0.0Michael Bleigh2013-02-161-37/+0
* Merge pull request #80 from intridea/release-2.0.0Michael Bleigh2013-02-166-10/+49
|\
| * bump gem version to 2.0.0Jerry Cheung2013-02-141-1/+1
| * add CHANGELOGJerry Cheung2013-02-141-0/+16
| * add Jerry as a maintainer in gemspecJerry Cheung2013-02-141-2/+2
| * add contribution guidelinesJerry Cheung2013-02-142-7/+29
| * gitignore Gemfile.lock http://yehudakatz.com/2010/12/16/clarifying-the-roles-...Jerry Cheung2013-02-141-0/+1
|/
* Merge pull request #34 from bradgessler/masterJerry Cheung2013-02-132-2/+22
|\
| * Added support for deferred properties to DashBrad Gessler2013-02-122-2/+22
|/
* Merge pull request #78 from intridea/merge-update-blockJerry Cheung2013-02-122-5/+13
|\
| * allow a block for merge and updateJerry Cheung2013-02-122-5/+13
|/
* Merge pull request #63 from ohrite/dash_defaultJerry Cheung2013-02-122-1/+15
|\
| * Concisely handle TypeError in Hashie::DashDoc Ritezel2013-02-121-7/+3
| * Fix Hashie::Dash DefaultsDoc Ritezel2013-02-122-1/+19
|/
* Merge pull request #76 from intridea/review-41Jerry Cheung2013-02-123-7/+54
|\
| * Merge pull request #41 from nashby/deep-mergeJerry Cheung2013-02-123-7/+54
| |\ |/ /
| * add DeepMerge extensionVasiliy Ermolovich2013-02-123-7/+54
* | Merge pull request #75 from intridea/review-62Jerry Cheung2013-02-122-4/+5
|\ \
| * \ Merge branch 'fix-18-keyerror' into review-62Jerry Cheung2013-02-121-1/+2
| |\ \
| | * | ruby 1.8 throws IndexError instead of KeyErrorJerry Cheung2013-02-121-1/+2
| |/ / |/| |
| * | Revert "Revert "Merge pull request #62 from dlupu/master""Jerry Cheung2013-02-121-3/+3
|/ /
* | Revert "Merge pull request #62 from dlupu/master"Jerry Cheung2013-02-111-3/+3
* | Merge pull request #62 from dlupu/masterJerry Cheung2013-02-111-3/+3
|\ \
| * | fix typo from previous commitDorian LUPU2012-11-021-3/+3
| * | enhance Hashie::Extensions::MethodReader#respond_to?, Hashie::Extensions::Met...Dorian LUPU2012-11-021-3/+3
* | | clean up Mash#fetch spec formattingJerry Cheung2013-02-111-16/+8
* | | Merge pull request #66 from arthwood/masterJerry Cheung2013-02-117-12/+60
|\ \ \
| * | | remove unnecessary scopingArtur Bilski2012-11-235-9/+9
| * | | spec code formattingArtur Bilski2012-11-231-3/+1
| * | | accept x86-mingw32 platform in GemfileArtur Bilski2012-11-231-0/+1
| * | | defined Hashie::Mash#fetchArtur Bilski2012-11-232-0/+49
| |/ /
* | | fix spacing, add comment to Trash#initialize_attributesJerry Cheung2013-02-111-2/+3
* | | Merge pull request #39 from sleverbor/initialize_translations_firstJerry Cheung2013-02-113-3/+26
|\ \ \
| * | | initialize translations before other properties in trashsleverbor2012-03-213-3/+26
| | |/ | |/|
* | | Merge pull request #28 from mattfawcett/multiple_coercionJerry Cheung2013-02-112-4/+17
|\ \ \
| * | | Let coerce_key support an array of keys to coerce. Also add an alias to the m...Matt Fawcett2011-11-302-4/+17
* | | | Merge pull request #27 from mattfawcett/masterJerry Cheung2013-02-112-2/+14
|\ \ \ \
| * | | | Handle coercion correctly when MergeInitializer is usedMatt Fawcett2011-11-222-2/+14
| |/ / /
* | | | Merge pull request #71 from jcamenisch/patch-1Jerry Cheung2013-02-111-1/+1
|\ \ \ \
| * | | | fix typoJonathan Camenisch2013-01-211-1/+1
| | |_|/ | |/| |
* | | | Merge pull request #72 from jordimassaguerpla/masterJerry Cheung2013-02-111-0/+1
|\ \ \ \ | |/ / / |/| | |
| * | | add license information to gemspecJordi Massaguer Pla2013-01-291-0/+1
|/ / /
* | | Merge pull request #57 from steved555/masterMichael Bleigh2012-10-262-7/+29
|\ \ \