summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 0.10.4 releasev0.10.40-10-stableJohn Mair2016-07-111-1/+1
* Merge pull request #1559 from ravinggenius/0.10-stableJohn Mair2016-07-117-1/+20
|\
| * Cleanup warningsYuki Nishijima2016-07-107-1/+20
|/
* Merge pull request #1482 from pry/0-10-stable-windows-fixv0.10.3John Mair2015-10-153-4/+10
|\
| * v0.10.30-10-stable-windows-fixstrcmp2015-10-142-1/+5
| * Merge branch '0-10-stable' of https://github.com/pry/pry into 0-10-stable-win...strcmp2015-10-144-7/+13
| |\ | |/ |/|
* | version 0.10.2 + changelog updatev0.10.2John Mair2015-09-252-1/+6
* | support ruby 2.2 frozen object exceptionsJohn Mair2015-09-251-0/+1
* | fix broken specs on 2.2 due to singleton_class method clashJohn Mair2015-09-251-6/+6
| * Explicitly set arch to 'universal' for mingw and mswinDaniel Berger2015-10-141-1/+1
| * Use CPU-less platforms for windowsEric Hodel2015-10-141-3/+5
|/
* Avoid loop in weird method locatorJuan Barreneche2015-09-252-1/+25
* v0.10.1v0.10.1Conrad Irwin2014-08-162-1/+8
* Don't return cols = 0 [Fixes #1267]Conrad Irwin2014-08-161-1/+1
* Merge pull request #1253 from adelevie/masterConrad Irwin2014-08-161-1/+1
|\
| * call #count on Array instead of Enumerator in pry_instance.rbAlan deLevie2014-07-071-1/+1
* | Merge pull request #1282 from JoshCheek/switch-to-rspecConrad Irwin2014-08-1652-481/+300
|\ \
| * \ Merge branch 'fix-for-rubinius' into switch-to-rspecJosh Cheek2014-08-151-0/+4
| |\ \
| | * | Switch test suite to RSpecJosh Cheek2014-08-1050-453/+274
| | * | Fix for RubiniusJosh Cheek2014-08-101-0/+4
| * | | Fix specs for JRubyJosh Cheek2014-08-151-24/+18
| * | | Run test in an object of its ownJosh Cheek2014-08-101-2/+2
| * | | Switch test suite to RSpecJosh Cheek2014-08-1051-455/+276
| |/ /
* | | Merge pull request #1280 from JoshCheek/patch-1Conrad Irwin2014-08-111-1/+1
|\ \ \ | |/ / |/| |
| * | Fix broken linkJosh Cheek2014-08-101-1/+1
|/ /
* | Revert "Get rid of Code#highlighted"Kyrylo Silin2014-07-206-8/+13
* | Revert "Fix tests"Kyrylo Silin2014-07-201-21/+18
* | Merge pull request #1271 from JoshCheek/fix_config_hooks_value_cachingKyrylo Silin2014-07-202-1/+9
|\ \
| * | Fix Pry.config.hooks # => parent's hooksJosh Cheek2014-07-202-1/+9
|/ /
* | Merge pull request #1242 from rrrene/patch-2Conrad Irwin2014-07-201-1/+1
|\ \
| * | Update docs badge in READMERené Föhring2014-06-041-1/+1
* | | Merge pull request #1256 from stevenharman/clean-up-ruby-warningsConrad Irwin2014-07-206-6/+11
|\ \ \
| * | | Cleanup method redefined warningsSteven Harman2014-06-241-0/+4
| * | | Cleanup private attribute? warningSteven Harman2014-06-241-1/+2
| * | | Clean File.exists? deprecation warningSteven Harman2014-06-241-1/+1
| * | | Cleanup * interpreted as argument prefix warningSteven Harman2014-06-242-2/+2
| * | | Cleanup method redefined warning for grepSteven Harman2014-06-241-1/+1
| * | | Cleanup unused local var warningSteven Harman2014-06-241-1/+1
* | | | Merge pull request #1268 from AndrewVos/multi-testConrad Irwin2014-07-204-1/+52
|\ \ \ \
| * | | | Add rake task for running tests on multiple rubiesAndrew Vos2014-07-202-4/+12
| * | | | Add scripts to `rake test` on all rubiesAndrew Vos2014-07-203-0/+43
| * | | | Fix test that fails in dockerAndrew Vos2014-07-201-1/+1
* | | | | Merge pull request #1270 from silentdth/masterConrad Irwin2014-07-201-1/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | support for redcar editorBenjamin Dodd2014-07-201-1/+3
|/ / / /
* | | | Merge pull request #1246 from jalvarezsamayoa/patch-1Ryan Fitzgerald2014-07-061-1/+1
|\ \ \ \
| * | | | Remove deprecation warning for File.exists?Javier Alvarez2014-06-121-1/+1
| | |_|/ | |/| |
* | | | Fix delegation of `quiet?` config method (fix #1261)Ryan Fitzgerald2014-07-064-6/+12
* | | | Always expand history file path (fix #1262)Ryan Fitzgerald2014-07-062-11/+31
| |/ / |/| |
* | | Merge pull request #1255 from stevenharman/clean-up-ambiguous-method-warningsConrad Irwin2014-06-242-2/+2
|\ \ \ | |/ / |/| |
| * | Clean up ambiguous method warningsSteven Harman2014-06-242-2/+2
|/ /