Commits on Nov 19, 2011
  1. @hone @mpapis

    Gem.load_env_plugins instead. thanks @mpapis

    Conflicts:
    
    	lib/bundler/cli.rb
    hone committed with mpapis Nov 18, 2011
  2. @hone @mpapis

    Revert "Merge pull request #1364 from tpope/bundler"

    This reverts commit 93942d7, reversing
    changes made to 8cf9a6d.
    
    Loading gem plugins can cause bundle install to fail.
    
    Conflicts:
    
    	lib/bundler/cli.rb
    
    Conflicts:
    
    	lib/bundler/cli.rb
    hone committed with mpapis Nov 17, 2011
  3. @mpapis

    patch 1 version

    mpapis committed Nov 19, 2011
Commits on Oct 24, 2011
  1. @mpapis

    ignore rubymine project

    mpapis committed Oct 24, 2011
  2. @mpapis
  3. @tpope @mpapis
Commits on Sep 30, 2011
  1. @indirect

    Version 1.0.21

    indirect committed Sep 30, 2011
  2. @indirect

    Version 1.0.21.rc

    indirect committed Sep 29, 2011
  3. @indirect
Commits on Sep 27, 2011
  1. @indirect

    Version 1.0.20

    indirect committed Sep 27, 2011
Commits on Sep 23, 2011
  1. @indirect
  2. Merge pull request #1449 from engineyard/1-0-stable

    Make tests green again (result of small changes to output format)
    Andre Arko committed Sep 22, 2011
  3. @jacobo
Commits on Sep 22, 2011
  1. @jacobo
Commits on Sep 21, 2011
  1. @sferik

    Merge pull request #1444 from timfel/patch-1

    Add support for MagLev.
    sferik committed Sep 21, 2011
  2. @timfel

    Add support for MagLev.

    timfel committed Sep 21, 2011
  3. @indirect

    don't explode when cwd is an invalid regex

    fixes #1430
    indirect committed Sep 21, 2011
  4. @indirect
  5. @indirect

    Update activation error language

    fixes #1117
    indirect committed Sep 19, 2011
  6. @indirect
Commits on Sep 19, 2011
  1. @indirect
  2. @indirect
  3. @indirect

    Remove whitespace in manpage

    indirect committed Sep 18, 2011
  4. @indirect

    Revert "Update to Thor 0.15.2.rc"

    This reverts commit 2eb123a.
    indirect committed Sep 18, 2011
  5. @indirect

    Update changelog

    indirect committed Sep 18, 2011
  6. @indirect

    Revert "Merge pull request #1213 from tigris/bundler"

    This reverts commit 45c4529, reversing
    changes made to d9dd6ed.
    indirect committed Sep 18, 2011
  7. @indirect

    Version 1.0.20.rc

    indirect committed Sep 18, 2011
Commits on Sep 18, 2011
  1. @indirect

    Merge pull request #1213 from tigris/bundler

    ---
    
    Use the --git-dir and --work-tree options for existing git repos rather than chdir to them. This is due to some problem with cron not properly chdiring.
    
    We run a "bundle install" in our git/hook/post-merge, and "git pull" out of cron ever hour. So if you push code to github, cron will pull it out on the hour and then post-merge will run the bundle install. All non-interactive. Unforunately this barfs on gems that use git as the source. From debugging it seems that when bundler does a chdir and then invokes git, the chain is something like cron -> invoked git -> invoked bundler -> chdird -> invoked git. For some reason the last git doesnt see the chdir and tries to run its git commands from ".".
    
    The only solution I see is to not chdir for git, but instead pass git the flags it needs to know which repo to act upon. Which is the solution I have implemented here, and it fixes the problem while still working normally as well (outside of cron).
    indirect committed Sep 17, 2011
  2. @indirect

    Update --local docs to be accurate

    fixes #1244
    indirect committed Sep 17, 2011
  3. @indirect

    Allow clearing --without groups

    fixes #1259
    indirect committed Sep 17, 2011
  4. @indirect

    Don't require Psych if Syck is loaded

    fixes #1239
    indirect committed Sep 17, 2011
  5. @indirect

    Update to Thor 0.15.2.rc

    indirect committed Sep 17, 2011
  6. @indirect

    correct docs on source order

    fixes #1310
    indirect committed Sep 17, 2011
  7. @indirect
  8. @indirect