Permalink
Commits on Apr 29, 2011
  1. Changelog for 1.1.pre.2

    indirect committed Apr 29, 2011
  2. Merge v1.0.13 from branch '1-0-stable'

    Conflicts:
    	CHANGELOG.md
    	lib/bundler/version.rb
    indirect committed Apr 29, 2011
  3. Version 1.0.13

    indirect committed Apr 29, 2011
Commits on Apr 28, 2011
  1. Merge pull request #1125 from dhh/bundler

    ---
    
    Still needs tests, but the tests should be against a new dsl_spec.rb
    indirect committed Apr 28, 2011
  2. Merge branch '1-0-stable'

    Conflicts:
    	lib/bundler/cli.rb
    	lib/bundler/source.rb
    indirect committed Apr 28, 2011
  3. Revert "Add github to the Gemfile DSL (thx DHH)"

    Unfortunately, the :github option breaks Gemfile compatibility with older versions of Bundler, for example those running on Heroku. Since Bundler 1.0 promised full compatibility across all 1.0.x releases, the :github option has been moved to version 1.1.
    
    This reverts commit 8b2649e.
    indirect committed Apr 28, 2011
  4. Merged pull request #1126 from evanphx/1-0-stable.

    Phase 1 of rubygems/bundler reintegration
    Andre Arko committed Apr 28, 2011
  5. Update work with rubygems master

    Evan Phoenix committed Apr 28, 2011
Commits on Apr 22, 2011
Commits on Apr 18, 2011
  1. Phase 1 of rubygems/bundler reintegration

    Evan Phoenix committed Apr 18, 2011
Commits on Apr 15, 2011
Commits on Apr 14, 2011
  1. die fit die

    indirect committed Apr 14, 2011
Commits on Apr 12, 2011
  1. sane-ify DSL a bit

    indirect committed Apr 12, 2011
Commits on Apr 11, 2011
  1. Version bump for HEAD users

    indirect committed Apr 11, 2011
  2. Merge branch '1-0-stable'

    Conflicts:
    	CHANGELOG.md
    	lib/bundler/cli.rb
    	lib/bundler/index.rb
    	lib/bundler/version.rb
    indirect committed Apr 11, 2011
Commits on Apr 9, 2011
  1. wrong evan

    indirect committed Apr 9, 2011
Commits on Apr 8, 2011
  1. Version 1.0.12

    indirect committed Apr 8, 2011
  2. Rescue from mkdir_p errors in configure_gem_home_and_path

    The mkdir_p was originally added for JRuby (see #602). As of JRuby
    1.6, some paths will actually raise an error, so we need to rescue
    and ignore those.
    nicksieger committed with indirect Feb 10, 2011
  3. Allow relative and absolute Paths to be compared

    When Paths were created with relative paths they would not be considered equal to a Path
    for the same location but as an absolute path.
    opsb committed with indirect Feb 9, 2011
Commits on Apr 6, 2011
  1. should just use fetch directly

    Alex Arnell committed with indirect Apr 6, 2011