summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* wrap the locked requirement in a DepProxyseg-resolver-error-formattingAndre Arko2015-08-011-1/+1
* [Resolver] Ordering and 1.8.7 arent friendsSamuel E. Giddins2015-07-312-3/+3
* [Resolver] Sort version conflicts by nameSamuel E. Giddins2015-07-301-1/+1
* [Resolver] Re-enable spec since it's no longer super slowSamuel E. Giddins2015-07-261-39/+38
* [Resolver] Tune conflict message wordingSamuel E. Giddins2015-07-263-6/+6
* [Resolver] Update for Molinillo API changesSamuel E. Giddins2015-07-263-10/+12
* [Resolver] Explain what each failed bit in a conflict tree resolved toSamuel E. Giddins2015-07-261-0/+3
* [Resolver] Update Molinillo to 0.4.0Samuel E. Giddins2015-07-263-84/+99
* Update specs for prettier version conflict messagesSamuel E. Giddins2015-07-237-17/+18
* [Resolver] No need to grab the name off of the conflicting requirementSamuel E. Giddins2015-07-221-4/+4
* [Resolver] Remove years-old commentSamuel E. Giddins2015-07-221-8/+0
* Get rid of clean_req in favor of a nicer #to_s in DepProxySamuel E. Giddins2015-07-222-16/+9
* [Resolver] Improve formatting of error messagesSamuel E. Giddins2015-07-211-3/+6
* [DepProxy] Also forward block args to the depSamuel E. Giddins2015-07-201-2/+2
* Merge pull request #3861 from esasse/rubocop-fixAndré Arko2015-07-2010-18/+13
|\
| * Fix Lint/UnusedBlockArgumentErick Sasse2015-07-2010-18/+13
|/
* Merge pull request #3859 from bundler/rubocop-fixAndré Arko2015-07-205-11/+6
|\
| * Fix Lint/StringConversionInInterpolationrubocop-fixErick Sasse2015-07-205-11/+6
|/
* Merge pull request #3846 from esasse/esasse-rubocop-1André Arko2015-07-200-0/+0
|\
| * Fix Lint/UnreachableCodeErick Sasse2015-07-173-6/+0
* | Merge pull request #3857 from esasse/esasse-rubocopAndré Arko2015-07-2020-65/+46
|\ \
| * | Fix pending offensesErick Sasse2015-07-197-14/+14
| * | Fix Style/SignalExceptionErick Sasse2015-07-193-9/+3
| * | Fix Style/SelfAssignmentErick Sasse2015-07-193-8/+3
| * | Fix Style/SemicolonErick Sasse2015-07-194-10/+10
| * | Fix Style/SingleLineMethodsErick Sasse2015-07-192-7/+3
| * | Fix Style/SingleSpaceBeforeFirstArgErick Sasse2015-07-198-15/+10
| * | Fix Style/SpaceAfterCommaErick Sasse2015-07-199-20/+21
|/ /
* | Fix Style/SpaceAroundOperatorsAndre Arko2015-07-1814-55/+44
* | Fix Style/SpaceInsideBlockBracesAndre Arko2015-07-1840-74/+68
* | Fix Style/SpaceInsideBlockBracesAndre Arko2015-07-1852-155/+152
* | Fix Lint/UnreachableCodeErick Sasse2015-07-183-6/+0
* | Merge pull request #3855 from esasse/esasse-rubocop-10Andre Arko2015-07-183-11/+5
|\ \
| * | Fix Style/SpaceAroundEqualsInParameterDefaultErick Sasse2015-07-173-11/+5
* | | Merge pull request #3852 from esasse/esasse-rubocop-7Andre Arko2015-07-184-9/+4
|\ \ \
| * | | Fix Style/SpaceBeforeCommaErick Sasse2015-07-174-9/+4
| | |/ | |/|
* | | Merge pull request #3851 from esasse/esasse-rubocop-6Andre Arko2015-07-183-25/+20
|\ \ \
| * | | Fix Style/SpaceBeforeSemicolonErick Sasse2015-07-173-25/+20
| |/ /
* | | Merge pull request #3849 from esasse/esasse-rubocop-4Andre Arko2015-07-186-15/+10
|\ \ \
| * | | Fix Style/SpaceInsideBracketsErick Sasse2015-07-176-15/+10
| |/ /
* | | Merge pull request #3848 from esasse/esasse-rubocop-3André Arko2015-07-1815-43/+37
|\ \ \
| * | | Fix Style/SpaceInsideHashLiteralBracesErick Sasse2015-07-1715-43/+37
| |/ /
* | | Merge pull request #3826 from cdwort/instructions_for_prerelease_notificationAndré Arko2015-07-181-1/+1
|\ \ \ | |_|/ |/| |
| * | Add instructions for getting prerelease notificationsAmy Unger2015-07-141-1/+1
* | | [RuboCop] Disable Style/TrailingComma for 1.8.7 supportSamuel E. Giddins2015-07-172-6/+3
| |/ |/|
* | Merge pull request #3832 from bundler/seg-rubocopSamuel E. Giddins2015-07-16182-1495/+1991
|\ \
| * | Fix binstubs on 1.8.7Samuel E. Giddins2015-07-163-0/+6
| * | [Rakefile] Properly install RuboCopSamuel E. Giddins2015-07-152-1/+5
| * | [Installer] Fix standaloneSamuel E. Giddins2015-07-151-1/+1
| * | Ensure rubocop is installed as a test depSamuel E. Giddins2015-07-151-0/+1