summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* align the hash that rubocop made wonkyalign-hashAndre Arko2015-08-131-5/+6
* Merge pull request #3920 from bundler/seg-update-rubocopSamuel E. Giddins2015-08-1322-37/+40
|\
| * [RuboCop] Update to 0.33.0Samuel E. Giddins2015-08-0722-37/+40
* | Merge pull request #3921 from bundler/seg-automatiekAndré Arko2015-08-082-62/+29
|\ \ | |/ |/|
| * [Rakefile] Use automatiek to manage vendoringSamuel E. Giddins2015-08-082-62/+29
|/
* Merge pull request #3911 from tf/command-plugin-helpAndré Arko2015-08-072-0/+15
|\
| * Add command plugin support to help commandTim Fischbach2015-08-042-0/+15
* | tweak wordingAndre Arko2015-08-071-1/+1
* | Merge pull request #3919 from esasse/esasse-docAndre Arko2015-08-071-1/+2
|\ \
| * | Clarify "--standalone" help messageErick Sasse2015-08-071-1/+2
|/ /
* | Merge pull request #3912 from bundler/update-code-of-conductAndré Arko2015-08-041-24/+15
|\ \ | |/ |/|
| * Update code of conduct to Contributor Covenant version 1.2.0update-code-of-conductErik Michaels-Ober2015-08-041-24/+15
|/
* Auto merge of #3898 - frsyuki:git-http-configured-auth, r=indirectHomu2015-08-032-5/+52
|\
| * Added unit tests for GitProxy#configured_uri_forSadayuki Furuhashi2015-07-301-0/+34
| * reverted unnecessary revert of refactoring at GitProxy#uri_escapedSadayuki Furuhashi2015-07-301-2/+2
| * Private access credentials for private git repositoriesSadayuki Furuhashi2015-07-301-5/+18
* | Merge pull request #3896 from EduardoBautista/fix-missing-sourceAndre Arko2015-08-022-1/+15
|\ \
| * | Failing spec for #3896Andre Arko2015-08-021-0/+10
| * | Print a warning when a gem can't be cached due to a missing sourceEduardo Bautista2015-07-301-1/+5
* | | Auto merge of #3862 - bundler:seg-resolver-error-formatting, r=segiddinsHomu2015-08-0212-171/+179
|\ \ \
| * | | 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 #3890 from esasse/fix-align-parametersAndre Arko2015-08-017-20/+15
|\ \ \ \
| * | | | Fix Style/AlignParametersErick Sasse2015-07-297-18/+15
* | | | | Merge pull request #3889 from esasse/rubocop-fixAndre Arko2015-08-018-16/+10
|\ \ \ \ \
| * | | | | Use %w[] instead of %w()Erick Sasse2015-07-297-9/+9
| * | | | | Fix Style/WordArrayErick Sasse2015-07-288-15/+9
| | |_|/ / | |/| | |
* | | | | only run extension standalone specs on 2.4+Andre Arko2015-08-011-1/+1
* | | | | Merge pull request #3828 from AlexanderPavlenko/masterAndre Arko2015-08-012-1/+16
|\ \ \ \ \
| * | | | | Fixes #3813 : --standalone generates incorrect paths for native extensionsAlexanderPavlenko2015-07-282-1/+16
* | | | | | Auto merge of #3893 - bundler:reduce-ci-failures, r=segiddinsHomu2015-07-314-10/+72
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | remove the code we don't needreduce-ci-failuresAndre Arko2015-07-301-9/+11
| * | | | | grumble grumble rubocop grumbleAndre Arko2015-07-291-1/+1
| * | | | | retry tests that hit rubygems.org up to 5 timesAndre Arko2015-07-293-2/+54
| * | | | | Try failing fast if prereq gems fail to installAndre Arko2015-07-291-8/+16
| | |/ / / | |/| | |
* | | | | Merge pull request #3866 from mattbrictson/man-bundle-gemAndré Arko2015-07-294-1/+80
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Add man page for `bundle gem`.Matt Brictson2015-07-214-1/+80
| | |_|/ | |/| |
* | | | Auto merge of #3892 - EduardoBautista:use-cgi-instead-of-uri, r=indirectHomu2015-07-301-1/+2
|\ \ \ \ | |_|/ / |/| | |