summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Preparing for release, 3.5.0v3.5.0Michael Herold2017-01-312-18/+3
* Merge pull request #383 from boffbowsh/patch-1Michael Herold2017-01-061-0/+1
|\
| * Add MergeInitializer to Coercian examplePaul Bowsher2016-12-011-0/+1
* | Support Ruby 2.4.0 (#389)Masahiro Saito2017-01-065-7/+24
* | Fix #385 - deep merge by reference bug (#386)Joe Marty2016-12-133-3/+10
* | Don't build 2.3.1 twice.Daniel Doubrovkine (dB.) @dblockdotorg2016-12-111-1/+0
* | Move CodeClimate test reporter to after_script.Daniel Doubrovkine (dB.) @dblockdotorg2016-12-111-0/+1
* | Merge pull request #388 from boffbowsh/fix-master-buildDaniel Doubrovkine (dB.) @dblockdotorg2016-12-101-1/+1
|\ \
| * | Move danger to before_scriptPaul Bowsher2016-12-101-1/+1
| |/
* | Merge pull request #387 from michaelherold/get-builds-passing-againDaniel Doubrovkine (dB.) @dblockdotorg2016-12-102-1/+2
|\ \
| * | Fix builds breaking due to Rake 11Michael Herold2016-12-082-1/+2
|/ /
* | Merge pull request #384 from boffbowsh/update-code-climateDaniel Doubrovkine (dB.) @dblockdotorg2016-12-054-3/+5
|\ \ | |/ |/|
| * Update to CodeClimate 1.0.xPaul Bowsher2016-12-044-3/+5
|/
* Add a logging layer to address common issues (#381)Michael Herold2016-11-0210-1/+127
* Merge pull request #380 from sazor/dash-default-and-as_jsonDaniel Doubrovkine (dB.) @dblockdotorg2016-10-315-1/+32
|\
| * Evaluate procs default values in object initializationsazor2016-10-315-4/+20
| * failing test for Dash default with proc not working with AS as_jsonJoe Van Dyk2016-10-282-0/+15
|/
* Merge pull request #378 from sazor/deep-find-all-fixDaniel Doubrovkine (dB.) @dblockdotorg2016-10-193-4/+29
|\
| * Deep find all goes inside all nested hashessazor2016-10-193-4/+29
|/
* Merge pull request #377 from sazor/check-ruby-version-without-rubygemsDaniel Doubrovkine (dB.) @dblockdotorg2016-10-185-4/+67
|\
| * Check ruby version without rubygemssazor2016-10-185-4/+67
|/
* Merge pull request #376 from sazor/fix-dig-bugDaniel Doubrovkine (dB.) @dblockdotorg2016-10-173-1/+21
|\
| * Fix dig bug for Arraysazor2016-10-173-1/+21
|/
* Merge pull request #371 from y-yagi/update_changelogDaniel Doubrovkine (dB.) @dblockdotorg2016-09-191-0/+2
|\
| * add `3.4.6` section to CHANGELOG [ci skip]yuuji.yaginuma2016-09-191-0/+2
|/
* Merge pull request #370 from whitethunder/indifferent-access-with-translation...Daniel Doubrovkine (dB.) @dblockdotorg2016-09-163-2/+40
|\
| * Use existing translations when using IndifferentAccess andMatt White2016-09-163-2/+40
|/
* Preparing for next development iteration, 3.4.7.dblock2016-09-163-2/+34
* Preparing for release, 3.4.6.v3.4.6dblock2016-09-162-28/+2
* Merge pull request #368 from jrafanie/fix_name_error_hashie_extensions_arrayDaniel Doubrovkine (dB.) @dblockdotorg2016-09-162-1/+4
|\
| * Since hashie/mash can be required alone, require its dependenciesJoe Rafaniello2016-09-162-1/+4
|/
* Preparing for next development iteration, 3.4.6.dblock2016-09-164-10/+42
* Preparing for release, 3.4.5.v3.4.5dblock2016-09-162-15/+3
* Added Danger, PR linter. (#366)Daniel Doubrovkine (dB.) @dblockdotorg2016-09-094-30/+38
* Checking for explicit definition of ActiveSupport::HashWithIndifferentAccess ...Mike Jarema2016-09-092-1/+2
* Lock activesupport to 4.x for testing.Atsushi Ishida2016-07-151-1/+1
* Hashie::Mash.load accepts a Pathname object. Closes #331.Atsushi Ishida2016-07-154-15/+39
* Merge pull request #358 from modosc/fix-array-digDaniel Doubrovkine (dB.) @dblockdotorg2016-06-0211-11/+97
|\
| * Fix support for Array#digjonathan schatz2016-06-0111-11/+97
|/
* Preparing for the next development iteration, 3.4.5.dblock2016-04-294-3/+37
* Preparing for release, 3.4.4.v3.4.4dblock2016-04-292-23/+3
* Merge pull request #352 from camelmasa/modify-readmeDaniel Doubrovkine (dB.) @dblockdotorg2016-02-231-3/+3
|\
| * Omit `return'camelmasa2016-02-231-3/+3
| * Fix too fexible regexcamelmasa2016-02-231-1/+1
|/
* Merge pull request #350 from marshall-lee/fix_ignore_undeclaredDaniel Doubrovkine (dB.) @dblockdotorg2016-02-083-3/+8
|\
| * Refactor IgnoreUndeclared#initialize_attributes.Vladimir Kochnev2016-02-081-2/+5
| * Stringified translations wasn't working in IgnoreUndeclared.Vladimir Kochnev2016-02-083-2/+4
* | Merge pull request #349 from k0kubun/digDaniel Doubrovkine (dB.) @dblockdotorg2016-02-084-2/+19
|\ \
| * | Convert Mash keys for #digTakashi Kokubun2016-02-084-2/+19
| |/
* | Merge pull request #348 from pra85/patch-1Daniel Doubrovkine (dB.) @dblockdotorg2016-02-071-1/+1
|\ \ | |/ |/|