Permalink
Commits on Apr 16, 2012
  1. Avoid warning running under Ruby 1.8.7.

    floehopper committed Apr 16, 2012
    I was seeing the following warning in Mocha's build.
    
        /home/vagrant/.rvm/gems/ruby-1.8.7-p358/gems/bundler-1.1.3/lib/bundler/rubygems_ext.rb:145:
    warning: discarding old eql?
    
    I like to avoid any warnings in the build output to keep the
    signal-to-noise ratio high in case any important warnings crop up.
    
    [1] http://floehopper.github.com/mocha
    [2] http://travis-ci.org/#!/floehopper/mocha/jobs/1088237/L45
    [3] http://travis-ci.org/#!/floehopper/mocha/jobs/1088237/L53
Commits on Apr 13, 2012
  1. Merge pull request #1848 from ZoFreX/master

    radar committed Apr 13, 2012
    Added documentation of the new :github option for gemfiles
  2. Merge pull request #1829 from dekellum/gemspec-cache-avoid-sideffects

    André Arko
    André Arko committed Apr 13, 2012
    Gemspec cache resurrected, avoid side effects
Commits on Apr 9, 2012
  1. Resurrect "Add simple cache to Bundler.load_gemspec"

    dekellum committed Apr 8, 2012
    This reverts prior revert 6b45e28, restoring 3d4163a.
Commits on Mar 26, 2012
  1. Merge pull request #1796 from Fluxx/add_docs_for_no_cache

    André Arko
    André Arko committed Mar 26, 2012
    Add docs for the --no-cache option
Commits on Mar 24, 2012
  1. Merge branch '1-1-stable'

    hone committed Mar 24, 2012
    Conflicts:
    	CHANGELOG.md
    	lib/bundler/version.rb
    
    1.1.3 release merge
  2. Bundler 1.1.3

    hone committed Mar 24, 2012
  3. update changelog for 1.1.3

    hone committed Mar 24, 2012
  4. Revert "Merge pull request #1789 from tenderlove/pathescape"

    indirect committed Mar 24, 2012
    This reverts commit d6f93f8, reversing
    changes made to f65ba39.
Commits on Mar 23, 2012
  1. bundler root path should be escaped

    tenderlove authored and hone committed Mar 23, 2012
  2. Merge pull request #1789 from tenderlove/pathescape

    sferik committed Mar 23, 2012
    bundler root path should be escaped
Commits on Mar 22, 2012
Commits on Mar 21, 2012
  1. Revert "Add simple cache to Bundler.load_gemspec"

    hone committed Mar 21, 2012
    This reverts commit 3d4163a.
    
    Breaks the build. I'm reverting this for now, until we can take a look
    into why this breaks it.
  2. Merge branch '1-1-stable'

    hone committed Mar 21, 2012
    Conflicts:
    	CHANGELOG.md
    	lib/bundler/version.rb
    
    1.1.2 release merge
  3. Bundler 1.1.2

    hone committed Mar 21, 2012
  4. update changelog for 1.1.2

    hone committed Mar 21, 2012
  5. Fixes #1782. Don't remove duplicate PATH sources

    hone committed Mar 21, 2012
    When using specifying version number, you can have multiple PATH
    sections for the same source.
    
    We were over eager in
    bundler@e31a1c7#L1R51.
    We should only remove the duplicate GIT sources, so let's explicitly
    check for that.
  6. Test case for bundle install not checking out git

    hone committed Mar 21, 2012
    During the 1.1 pre/RC releases, there were duplicate GIT source sections
    generated in the `Gemfile.lock`. These would confuse bundler and the
    wrong source would get attached to the spec. This test case breaks if we
    don't fix this here:
    bundler@e31a1c7#L1R51
Commits on Mar 20, 2012
Commits on Mar 19, 2012
  1. Update CHANGELOG.md

    josevalim committed Mar 19, 2012
  2. Ensure tests pass on 1.8.7.

    josevalim committed Mar 19, 2012