summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Use locked_requirement platform to print it outfix-fix-3862Andre Arko2015-08-021-1/+9
* 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
|\ \ \ \ | |_|/ / |/| | |
| * | | Use CGI instead of URI for escaping URL paramsEduardo Bautista2015-07-291-1/+2
|/ / /
* | | Merge pull request #3886 from esasse/rubocop-fixAndré Arko2015-07-276-12/+8
|\ \ \
| * | | Better formattingErick Sasse2015-07-271-1/+2
| * | | Fix Style/AlignArrayErick Sasse2015-07-276-12/+7
* | | | Merge pull request #3885 from bundler/aa-3811-specific-test-depsAndré Arko2015-07-273-1/+20
|\ \ \ \
| * | | | block spaces for rubocopaa-3811-specific-test-depsAndre Arko2015-07-271-2/+2
| * | | | double quotes for RuboCopAndre Arko2015-07-271-2/+2
| * | | | test for rspec and minitest specific depsAndre Arko2015-07-271-11/+11
| * | | | Pessimistic test framework versions for bundle gem commandTim Fischbach2015-07-273-1/+20
| |/ / /
* | | | Auto merge of #3884 - bundler:rubocop-first, r=indirectHomu2015-07-281-4/+6
|\ \ \ \ | |/ / / |/| | |
| * | | Fail fast if RuboCop task failsrubocop-firstAndre Arko2015-07-271-3/+5
| * | | Run Rubocop before specs.Tim Moore2015-07-271-4/+4
|/ / /
* | | Merge pull request #3881 from roseweixel/sanitize-config-testAndré Arko2015-07-272-3/+5
|\ \ \
| * | | remove trailing whitespaceRose Weixel2015-07-261-1/+1
| * | | push logic for dealing with string 'false' down to Settings classRose Weixel2015-07-262-9/+5