summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Avoid aliasing a missing method in specs on old RGseg-setup-activate-no-gemsSamuel Giddins2017-04-041-8/+12
* Add temporary exemptions to default gem activation testsSamuel Giddins2017-04-041-6/+19
* Avoid requiring the whole of rubygems/ext to backport monitorSamuel Giddins2017-04-041-1/+7
* Add a spec for not activating any gems during Bundler.setupSamuel Giddins2017-04-041-0/+43
* Auto merge of #5562 - aledalgrande:binstubs-docs, r=segiddinsThe Bundler Bot2017-04-041-0/+3
|\
| * Add bundle binstubs to the main man pageAlessandro Dal Grande2017-04-041-0/+3
|/
* Auto merge of #5556 - bundler:seg-zoom-zoom, r=indirectThe Bundler Bot2017-04-043-62/+73
|\
| * [Definition] Add comment explaining why we need to override a deps typeseg-zoom-zoomSamuel Giddins2017-04-031-0/+6
| * [LockfileParser] Add comments to NAME_PATTERNSamuel Giddins2017-04-031-1/+9
| * [Runtime] Avoid re-locking when not unlocking and nothing has changedSamuel Giddins2017-04-032-6/+11
| * [LockfileParser] Use a single name-version regexpSamuel Giddins2017-04-031-33/+33
| * [Definition] Move #fixup_dependency_types! into #converge_dependenciesSamuel Giddins2017-04-031-21/+12
| * [Definition] Only print change reason if it is non-emptySamuel Giddins2017-04-031-1/+2
| * [Runtime] Suggest `bundle install` instead of just `bundle`Samuel Giddins2017-04-031-1/+1
|/
* Auto merge of #5555 - bundler:seg-outdated-new-machine, r=indirectThe Bundler Bot2017-04-035-24/+59
|\
| * [Outdated] Stop printing “from” messages in random placesseg-outdated-new-machineSamuel Giddins2017-03-311-17/+15
| * [Outdated] Support running when gems are not yet installedSamuel Giddins2017-03-312-1/+16
| * [LazySpecification] Implement #git_versionSamuel Giddins2017-03-311-0/+5
| * [UI::Shell] Simplify level comparison logicSamuel Giddins2017-03-312-6/+23
* | Auto merge of #5554 - bundler:seg-validate-git-specs, r=indirectThe Bundler Bot2017-04-032-1/+9
|\ \
| * | [Source::Git] Only validate specs once (on download)seg-validate-git-specsSamuel Giddins2017-03-312-1/+9
| |/
* | Auto merge of #5542 - bundler:seg-conflict-minimal-dependencies, r=indirectThe Bundler Bot2017-04-035-1/+145
|\ \ | |/ |/|
| * Use reject! and map.flatten(1) for Ruby 1.8.7 supportseg-conflict-minimal-dependenciesSamuel Giddins2017-03-301-4/+4
| * [VersionRanges] Support old RG without Requirement#concatSamuel Giddins2017-03-301-4/+3
| * [VersionRanges] Say that != x, = x is emptySamuel Giddins2017-03-302-3/+47
| * [Resolver] Handle when there is no inherently conflicting set of depsSamuel Giddins2017-03-301-1/+1
| * [Resolver] Only include minimal set of conflicting deps in conflict messageSamuel Giddins2017-03-304-1/+102
* | Auto merge of #5546 - jules2689:master, r=segiddinsThe Bundler Bot2017-03-311-2/+11
|\ \
| * | Change `definition#converge_dependencies` comparison to an iterator for perfo...Julian Nadeau2017-03-301-2/+11
* | | Auto merge of #5550 - emsk:update-rubocop, r=segiddinsThe Bundler Bot2017-03-303-7/+65
|\ \ \ | |_|/ |/| |
| * | [RuboCop] Update to 0.48.0emsk2017-03-313-7/+65
| |/
* | Auto merge of #5548 - coderanger:patch-2, r=segiddinsThe Bundler Bot2017-03-301-1/+1
|\ \ | |/ |/|
| * Correct the config option name corresponding to --binstubsNoah Kantrowitz2017-03-291-1/+1
|/
* Auto merge of #5545 - coderanger:patch-1, r=segiddinsThe Bundler Bot2017-03-291-2/+5
|\
| * Fix indentation to match other lines.Noah Kantrowitz2017-03-281-1/+1
| * Document that --retry works for update.Noah Kantrowitz2017-03-281-2/+5
* | Auto merge of #5539 - jules2689:master, r=segiddinsThe Bundler Bot2017-03-292-18/+17
|\ \
| * | Change LockFileParse dependencies class variable from an array to a hashJulian Nadeau2017-03-282-18/+17
| |/
* | Auto merge of #5509 - brchristian:amber_regressions, r=segiddinsThe Bundler Bot2017-03-292-1/+43
|\ \ | |/ |/|
| * add testsBrian Christian2017-03-281-0/+26
| * use Gem::Version.correct? instead of catching exceptionsBrian Christian2017-03-231-3/+7
| * extract color logic into private methodBrian Christian2017-03-081-9/+13
| * only rescue relevant exceptionsBrian Christian2017-03-081-1/+1
| * use yellow color when version is moving backwardsBrian Christian2017-03-081-1/+9
* | Auto merge of #5531 - colby-swandale:issues-drop-rails23, r=colby-swandaleThe Bundler Bot2017-03-241-6/+0
|\ \
| * | fix EOLColby Swandale2017-03-241-1/+1
| * | remove rails 2.3 from ISSUES guideColby Swandale2017-03-231-7/+1
* | | Auto merge of #5534 - rafaelfranca:fix-mirror-socket, r=andremedeirosThe Bundler Bot2017-03-231-0/+2
|\ \ \
| * | | Require socket in the file that needs itRafael Mendonça França2017-03-231-0/+2
|/ / /
* | | Auto merge of #5524 - colby-swandale:fix-gem-command-git, r=colby-swandaleThe Bundler Bot2017-03-232-18/+35
|\ \ \