Commit graph

275 commits

Author SHA1 Message Date
Eric Anderson
28f684037a Revert "allow bundler 1.x releases" from #126
This reverts commit 8153b926de.
2013-03-05 22:30:14 -05:00
Will Farrington
8088edd47f Bump modules 2013-03-05 17:35:51 -08:00
Will Farrington
ccc38151af Merge pull request #116 from pedrogimenez/patch-1
Update Puppetfile
2013-03-05 14:16:39 -08:00
Will Farrington
1df99f2bc6 Merge pull request #123 from paxan/dont-die-when-head-is-detached
Don't panic if your HEAD is detached
2013-03-05 14:02:33 -08:00
Pavel Repin
9c3b169156 It's cleaner to have another case: "not on any branch". 2013-03-05 13:57:03 -08:00
Will Farrington
f5ce26c397 Merge pull request #126 from indirect/bundler_update
Allow Bundler 1.x releases
2013-03-05 13:25:35 -08:00
Andre Arko
8153b926de allow bundler 1.x releases 2013-03-05 13:14:16 -08:00
Pavel Repin
549f113930 Don't die if HEAD ref is not symbolic.
Examples of situations when HEAD is not symbolic:

 * You're doing interactive rebase
 * You're using git bisect
 * ... and so on.
2013-03-05 12:23:38 -08:00
Kevin Suttle
320ad92e4d Correct typo in README
s/bothers/others
2013-03-05 14:29:52 -05:00
Pedro Gimenez
3575103359 Update Puppetfile 2013-03-05 13:47:32 +01:00
Will Farrington
c3808d88b6 README overhaul 2013-03-04 23:16:43 -08:00
Will Farrington
766f9c4894 Merge pull request #88 from indirect/faster_boxen
speed up all invocations of boxen
2013-03-04 15:10:58 -08:00
Will Farrington
c766b578c1 Merge pull request #87 from indirect/my-config
work with EDITOR like 'mate -w'
2013-03-04 15:07:06 -08:00
Will Farrington
b97c0e9969 Merge pull request #86 from indirect/bundler_bootstrap
Fix bundler version install stanza
2013-03-04 15:06:29 -08:00
Will Farrington
75a9261cd3 Update README for Puppet Module sharing docs 2013-03-05 07:51:08 +10:00
Andre Arko
bfe6c82f43 speed up all invocations of boxen
when running Bundler, it just so happens that --local should (but does not)
skip updating the gems in vendor/cache. explicitly skipping that update drops
most of a second off of every run of boxen.
2013-03-02 00:41:16 -08:00
Andre Arko
b4a63adcab install the version you're checking for 2013-03-01 15:31:38 -08:00
Andre Arko
8229fe238a work with EDITOR like 'mate -w' 2013-03-01 15:23:49 -08:00
Will Farrington
3a6e8ee440 Merge pull request #85 from boztek/nuke-delete-receipts
Fix script/nuke to properly delete receipts
2013-02-28 20:02:39 -08:00
Boris Gordon
f6572da4e8 script/nuke failed to delete receipts
Can't use a bare system call because we need globbing
2013-03-01 14:13:33 +11:00
Will Farrington
06d4ab1375 Merge pull request #83 from rweng/patch-1
change $USER to ${USER} to avoid history expansion
2013-02-28 12:45:10 -08:00
Robin Wenglewski
8d29c7b59d change $USER to ${USER} to avoid history expansion
see [here](http://stackoverflow.com/questions/15140221/weired-zsh-behavior-how-to-debug/)
2013-02-28 19:24:07 +01:00
Will Farrington
0b590ebc49 Refactor git handling 2013-02-28 14:24:10 +11:00
Will Farrington
0ab88d8b30 Merge pull request #74 from j2sol/master
Update boxen-my-config for the proper login env
2013-02-26 22:07:36 -08:00
Will Farrington
0e26e6dc2f Merge pull request #76 from fromonesrc/patch-1
add help info to readme
2013-02-26 18:22:00 -08:00
Adam Ochonicki
0b8282e36b halp! 2013-02-24 14:26:51 -05:00
Jesse Keating
1e9e967472 Update boxen-my-config for the proper login env 2013-02-22 23:53:32 -08:00
Yossef Mendelssohn
9fdde61cdf Merge pull request #45 from jroes/patch-2
Dat MIT
2013-02-17 17:47:09 -08:00
Will Farrington
923bcf46ae Merge pull request #53 from kyleprager/master
More detailed documentation on how to include modules.
2013-02-16 21:58:56 -08:00
Will Farrington
02adc82282 Merge pull request #54 from adamyonk/patch-1
Updates rails docs for consistency
2013-02-16 21:58:29 -08:00
Adam Jahnke
9ca47d5d22 Updates rails docs for consistency 2013-02-16 20:49:20 -06:00
Kyle Prager
3e8aa6dbbf Update README.md including module documentation
The README.md has more detailed instructions on how to include modules from Github by editing your Puppetfile and site.pp files.
2013-02-16 18:01:08 -08:00
Will Farrington
eb6290f4b8 Merge pull request #44 from jroes/patch-1
Typo
2013-02-15 20:48:02 -08:00
Jonathan Roes
4481202423 Dat MIT 2013-02-15 20:32:00 -08:00
Jonathan Roes
9635bad0ef Typo 2013-02-15 22:52:29 -05:00
Will Farrington
5203951a97 Merge pull request #36 from kevinSuttle/master
Add missing opt dir commands
2013-02-15 15:32:13 -08:00
John Barnette
8dab540720 How did I miss this 2013-02-15 14:56:16 -08:00
Kevin Suttle
09e8926fe9 Add opt dir instructions
Add missing instructions that will affect the shell config.
2013-02-15 17:46:13 -05:00
Will Farrington
a727d5507e dangling GH_ 2013-02-15 12:59:02 -08:00
Will Farrington
f12b4713fe Merge pull request #30 from rafaelfranca/patch-1
Fix typo
2013-02-15 12:33:13 -08:00
Rafael Mendonça França
eda66ae79f Fix typo 2013-02-15 18:20:53 -02:00
Will Farrington
75a2bfbf14 bump deps 2013-02-15 10:09:20 -08:00
Will Farrington
2ca5befc42 fix 2013-02-14 18:16:39 -08:00
Will Farrington
f54871efa0 one dot oh 2013-02-14 18:11:12 -08:00
John Barnette
f5cbb66bc6 Bump gem deps
/cc @mastahyeti
Fixes #28
2013-02-13 10:05:08 -08:00
Will Farrington
94b10f220b first spike at docs on puppet modules 2013-02-12 19:44:35 -08:00
Will Farrington
d4af4bf811 Update our boxen template with the latest and greatest 2013-02-12 16:41:56 -08:00
Yossef Mendelssohn
92dd6a9fdb XCode → Xcode
We of all people should care about how to capitalize something properly.
2013-02-10 17:53:38 -08:00
Will Farrington
3b06d26165 better error messages about auto updating 2013-02-06 21:59:26 -08:00
Will Farrington
60851f970a more doc 2013-02-06 21:28:45 -08:00