Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
branch: fix-backtracki…
Commits on Jul 21, 2013
  1. @gnufied
  2. @gnufied
  3. @gnufied

    Fix some gems not getting resolved #2532 and 2464

    gnufied authored
    When there is a conflict because of an activated gem
    we shouldn't blindly try and backtrack to parent
    of current gem (which is conflicting). If there
    are no other versions of parent available, it will
    lead to dead end.
    
    In which case try backtracking to gem that originally
    activated the conflicting gem.
Commits on Jul 18, 2013
  1. @indirect

    Merge pull request #2547 from simi/require_true_changelog

    indirect authored
    PR #2538 (allow `require: true` as an alias for `require: <name>`) CHANGELOG entry
  2. @simi

    PR #2538 (allow `require: true` as an alias for `require: <name>`) CH…

    simi authored
    …ANGELOG entry
    
    [ci skip]
  3. @indirect

    Merge pull request #2545 from bundler/refactor-platform-detection

    indirect authored
    Extract Current Ruby version/platform detection from dependency.rb
  4. @gnufied

    Update Gemfile man page with new require: true option

    gnufied authored
    User can additionally specifiy require: true in gem dependency.
    It behaves same as not specifying any argument.
  5. @gnufied

    Merge pull request #2538 from ndbroadbent/allow_require_true

    gnufied authored
    Allow `require: true` as an alias for `require: <name>`
  6. @gnufied

    Extract Current Ruby version/platform detection from dependency.rb

    gnufied authored
    That can be reused across several places in bundler and hence
    extracted that code which is responsible for properly
    detecting current ruby version.
Commits on Jul 16, 2013
  1. @gnufied

    Remove extraneous whitespace

    gnufied authored
  2. @gnufied

    Merge pull request #2542 from bundler/add-codeclimate-badge

    gnufied authored
    Add CodeClimate badge
  3. @gnufied

    Add CodeClimate badge

    gnufied authored
    [ci skip]
Commits on Jul 13, 2013
  1. @ndbroadbent
Commits on Jul 4, 2013
  1. @indirect

    dammit, fumblefingers

    indirect authored
Commits on Jul 3, 2013
  1. @indirect

    Merge pull request #2510 from headius/stack_friendly_recursion

    indirect authored
    Add and use a new catch/throw mechanism that's stack-friendly.
  2. @indirect

    Merge pull request #2481 from eagletmt/parallel-install

    indirect authored
    Parallel installation
  3. @indirect

    Merge pull request #2497 from mipearson/with_cached_gemspecs

    indirect authored
    Obtain gemspecs from the local system cache if available.
    
    fixes #2444
  4. @indirect

    Merge pull request #2487 from rahearn/outdated-dependency-info

    indirect authored
    Add dependency information from Gemfile to bundle outdated output
    
    Conflicts:
    	CHANGELOG.md
  5. @indirect

    Merge pull request #1624 from sunaku/manpath

    indirect authored
    set $MANPATH in Bundler::Runtime#setup_environment
    
    Conflicts:
    	lib/bundler/runtime.rb
  6. @indirect

    Merge pull request #2249 from dblock/debug-resolver-tree

    indirect authored
    Added ENV['DEBUG_RESOLVER_TREE'] which outputs the resolver tree.
    
    Conflicts:
    	CHANGELOG.md
  7. @indirect
  8. @indirect

    Merge branch '1-3-stable'

    indirect authored
    Conflicts:
    	spec/bundler/gem_helper_spec.rb
  9. @indirect

    minor bundle bin cleanup

    indirect authored
  10. @rehevkor5 @indirect

    Add info about `bundle env` to CHANGELOG.md

    rehevkor5 authored indirect committed
    New command `bundle env` prints information about bundler's environment.
    
    Notably, `bundle e`, which some people used as shorthand for `bundle exec`, is no longer operable as it matches both "exec" and "env".
  11. @indirect

    Merge pull request #2485 from bwillis/master

    indirect authored
    Preserve original path for gemspec
    
    fixes #2458
  12. @bwillis @indirect

    Preserve original gemspec path

    bwillis authored indirect committed
    In order to keep the gemspec paths for use in different paths, the path
    is preserved in it's original form.
    
    This change addresses #2458.
    
    Conflicts:
    	CHANGELOG.md
  13. @indirect

    Merge pull request #2501 from kml/master

    indirect authored
    TypeError: can't convert Pathname into String
    
    closes #2504
  14. @kml @indirect

    Coerce Pathname into String for MacRuby

    kml authored indirect committed
  15. @indirect

    Merge pull request #2516 from rthbound/patching_specs

    indirect authored
    Kills whitespace
    Subject-verb agreement fixes
    mri -> MRI
  16. @rthbound @indirect

    gemfile -> Gemfile for consistency in spec

    rthbound authored indirect committed
  17. @rthbound @indirect

    Rewording of it-strings in security_policy_spec

    rthbound authored indirect committed
      - Rewording due to current wording of describe-strings, new wording should read
        more easily (in both the spec's source and output)
  18. @rthbound @indirect

    Fixes grammar and an inaccurate it-string

    rthbound authored indirect committed
  19. @rthbound @indirect

    Kills whitespace

    rthbound authored indirect committed
  20. @rthbound @indirect

    Subject-verb agreement fix

    rthbound authored indirect committed
  21. @rthbound @indirect

    Kills some whitespace at ends of files

    rthbound authored indirect committed
Something went wrong with that request. Please try again.