summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Preparing for release, 2.1.1.v2.1.1dblock2014-04-122-2/+6
* Fix Rubocop issues.Michael Bleigh2014-04-112-5/+5
* Check arity of #to_hash before calling. Closes #144Michael Bleigh2014-04-112-3/+25
* Merge pull request #142 from petergoldstein/feature/run_transpecDaniel Doubrovkine (dB.) @dblockdotorg2014-04-0614-340/+348
|\
| * Fix Rubocop violation introduced by transpecPeter M. Goldstein2014-04-061-3/+2
| * Convert specs to RSpec 2.14.7 syntax with TranspecPeter M. Goldstein2014-04-0614-338/+347
|/
* Bump version, preparing for release.v2.1.0dblock2014-04-063-3/+10
* Present tense for specs.dblock2014-04-0614-280/+281
* Added IgnoreUndeclared, an extension to silently ignore undeclared properties...Michael Righi2014-04-065-0/+92
* Added Hashie::Rash.epitron2014-04-065-1/+203
* Added Trash#permitted_input_keys and inverse_translations.Artem Baguinski2014-04-063-2/+28
* Trash#translations correctly maps original to translated names.Artem Baguinski2014-04-063-10/+30
* Merge pull request #134 from tylerdooling/traverseDaniel Doubrovkine (dB.) @dblockdotorg2014-04-065-0/+131
|\
| * Adds deep_fetch extension for nested access.Tyler Dooling2014-04-045-0/+131
* | IndifferentAccess now works without MergeInitializer.Peter Brindisi2014-04-063-72/+127
* | Updated CHANGELOG with a link to #136.dblock2014-04-061-1/+1
* | Merge pull request #140 from markiz/issue-136-removeDaniel Doubrovkine (dB.) @dblockdotorg2014-04-062-45/+1
|\ \
| * | CHANGELOG updateMark Abramov2014-04-051-0/+1
| * | Remove hashie/extensions/structure.rb because it never even workedMark Abramov2014-04-041-45/+0
|/ /
* | Shorten description to fit on one line.Daniel Doubrovkine (dB.) @dblockdotorg2014-04-041-1/+1
* | Updated comments and README to Ruby 1.9.x syntax.dB2014-04-042-20/+20
* | Locked Rubocop at 0.20.0.dB2014-04-041-1/+1
* | Merge pull request #139 from bartoszkopinski/patch-1Daniel Doubrovkine (dB.) @dblockdotorg2014-04-044-7/+15
|\ \ | |/ |/|
| * fixes for rubocop 0.20.0Bartosz Kopiński2014-04-042-3/+3
| * upgrading rubocop to 0.20.0 to work with ruby-head buildsBartosz Kopiński2014-04-041-1/+1
| * adding more rubies to travisBartosz Kopiński2014-04-041-3/+11
|/
* WAT is this?dblock2014-03-301-5/+0
* Fixed Rubinius build.dblock2014-03-301-0/+1
* Added Rubocop.dblock2014-03-3027-545/+606
* A much more thorough CONTRIBUTING from Grape.dblock2014-03-301-19/+110
* Merged.dblock2014-03-303-6/+19
|\
| * Fix broken Hashie::Hash#to_hash(:symbolize_keys => true)Matt Huggins2014-02-122-6/+18
* | Merge branch 'deep_merge_without_include' of github.com:defsprite/hashiedblock2014-03-303-11/+22
|\ \
| * | replacing dynamic include with recursion helper methodChristoph Sassenberg2014-01-262-11/+21
| |/
* | Removed unused dependencies.dblock2014-03-302-7/+3
* | Merge branch 'feature/add_ruby_2_1_0' of github.com:petergoldstein/hashiedblock2014-03-302-2/+6
|\ \
| * | Add Ruby 2.1.0 to Travis config. Remove guard from development dependencies,...Peter M. Goldstein2013-12-253-2/+7
| |/
* | Re-added RBX.dblock2014-03-302-1/+3
* | Merge branch 'fix_failed_test_in_rbx' of github.com:kyanny/hashiedblock2014-03-302-0/+3
|\ \
| * | Fix failed test on MRI <= 1.9.3 and REEKensuke Nagae2013-12-021-0/+1
| * | Fix Rubinius test runtime errorKensuke Nagae2013-12-021-0/+2
| |/
* | Added explicit test for #125.dblock2014-03-301-0/+4
* | Merge branch 'patch-1' of github.com:rafalchmiel/hashiedblock2014-03-301-92/+116
|\ \
| * | Add syntax highlighting to examplesRafal Chmiel2013-12-021-92/+116
| |/
* | Merge branch 'fix-113-dash-merge' of github.com:spencer1248/hashiedblock2014-03-303-0/+74
|\ \
| * | Fix Dash#merge!Spencer Rogers2013-11-302-0/+36
| * | Fix Dash#mergeSpencer Rogers2013-11-302-0/+37
| |/
* | Merge branch 'extend' of github.com:amatsuda/hashiedblock2014-03-301-1/+1
|\ \
| * | Object#extend is a public methodAkira Matsuda2013-11-301-1/+1
| |/
* | Merge branch 'recursive_to_hash_options' of github.com:pwillett/hashiedblock2014-03-303-3/+31
|\ \