Commit graph

215 commits

Author SHA1 Message Date
Adam Ochonicki
3e3b928dc5 Merge pull request #281 from sclm/patch-1
Fix the line numbers for the variable highlighting in docs
2013-05-17 14:56:09 -07:00
Stephen McMillen
bd01a1e6b9 Fix the line numbers for the variable highlighting. 2013-05-17 17:54:33 -03:00
Adam Ochonicki
f57089f589 Merge pull request #274 from mdelagralfo/github-enterprise
Github enterprise config and docs
2013-05-15 12:24:15 -07:00
Adam Ochonicki
3fe86022b6 Put a space in this 2013-05-13 21:10:27 -03:00
Morgan Delagrange
90837b5849 adding docs for Github Enterprise users 2013-05-13 16:13:46 -05:00
Morgan Delagrange
acf13e6e2d adding GitHub Enterprise variables to Boxen config 2013-05-13 15:54:24 -05:00
Adam Ochonicki
e83ac30751 Alpha sort 2013-05-11 20:43:09 -03:00
Adam Ochonicki
419688a0bb Some readme consistency 2013-05-11 19:19:29 -03:00
Adam Ochonicki
bff779bc3d Update to chown staff to be consistent with script.sh. Fixes #152. 2013-05-11 11:19:03 -03:00
Adam Ochonicki
63386bb66a Merge pull request #241 from mattdbridges/add-fde-tip
Update readme with note about no-fde option
2013-05-09 05:46:05 -07:00
Adam Ochonicki
d1a806e421 Update nodejs version in readme 2013-05-08 23:23:42 -03:00
Adam Ochonicki
6527d53ec0 Merge pull request #260 from sankage/puppet-updates
update puppetfile to latest module versions
2013-05-08 19:22:40 -07:00
David Briggs
ee2d94256a update puppetfile and readme to latest versions 2013-05-08 22:17:47 -04:00
Adam Ochonicki
d11c57e9f3 Merge pull request #249 from evilensky/master
remove "get" from "to get bootstrap"
2013-05-08 19:03:22 -07:00
Adam Ochonicki
7cef7ae2ef Merge pull request #256 from wallace/master
.projects should be ignored by default
2013-05-08 10:42:10 -07:00
Will Farrington
5c339675c8 Merge pull request #259 from sankage/outdated-gemfile
update gemfile to use current boxen gem
2013-04-28 17:57:55 -07:00
David Briggs
4fd87ea316 update vender cache 2013-04-28 17:40:55 -04:00
David Briggs
aa35055ade update gemfile to use current boxen gem 2013-04-28 17:00:44 -04:00
Jonathan Wallace
939a6f25a7 Update .gitignore
.projects should be ignored by default based on https://github.com/boxen/our-boxen/issues/48#issuecomment-13660086
2013-04-25 17:24:57 -03:00
Eugene Vilensky
09873beeba Minor grammatical edit
I think in this case "bootstrap" is already a verb.
2013-04-18 18:45:32 -05:00
Matt Bridges
7f9e2dbebc No hard drive encryption
Some users may not want to encrypt their hard drive, so make
sure they know the option exists to not have to encrypt their
hard drive.
2013-04-15 12:15:48 -05:00
Johan Haals
08009e9b07 Updates README
Noticed that Boxen won't run people/manifests/user-name.pp if it
includes dash
2013-04-05 13:41:07 +02:00
Johan Haals
3c1301dba0 Merge pull request #202 from toolbear/patch-1
Small typo and grammar correction in modules doc
2013-03-27 10:11:21 -07:00
Johan Haals
123432b852 Merge pull request #150 from petems/add_nuke_instructions
Added 'nuke' instructions.
2013-03-27 10:10:13 -07:00
Tim Taylor
176f1a4d6a Small typo and grammar correction in modules doc 2013-03-26 20:14:57 -03:00
Johan Haals
d512c2e310 Merge pull request #199 from josh-/master
Update README
2013-03-23 07:10:21 -07:00
Josh Parnham
e977e27d49 Update README 2013-03-23 21:40:47 +11:00
Will Farrington
72517b2a12 Bump homebrew to fix incompatibilities 2013-03-11 15:36:17 -04:00
Will Farrington
20ad8323cb Use full paths to bins in script/bootstrap 2013-03-11 14:13:21 -04:00
petems
ed5588375a Added 'nuke' instructions. 2013-03-08 00:01:30 +00:00
Will Farrington
0218b35b20 Merge pull request #148 from jperl/master
Added initial FAQ
2013-03-07 14:29:32 -08:00
Jon Perl
34dcce6911 initial faq 2013-03-07 16:21:36 -05:00
Will Farrington
ebf3abbcb7 Merge pull request #136 from paxan/warn-about-sudo
Minor nit: be informative about impending "sudo" activity.
2013-03-07 08:50:48 -08:00
Pavel Repin
e359be2cb1 Further clarification about Bundler installation. 2013-03-07 08:46:52 -08:00
Will Farrington
ee9b6983a2 Merge pull request #120 from kevinSuttle/master
Correct Typo In README
2013-03-07 08:14:37 -08:00
Pavel Repin
53e3c284bb Use "sudo -p" with informative prompt instead of echo.
Won't show the prompt if sudo hasn't timed out since
previous authorized sudo activity.
2013-03-06 01:50:03 -08:00
Pavel Repin
e9284cd796 Be informative about impending "sudo" activity. 2013-03-05 23:13:54 -08:00
Will Farrington
8d4836e6a0 Merge branch 'master' of https://github.com/boxen/our-boxen 2013-03-05 21:49:56 -08:00
Will Farrington
a5db44c855 new class names 2013-03-05 21:49:31 -08:00
Will Farrington
62e5972606 Merge pull request #134 from ericanderson/revert_126
Revert "allow bundler 1.x releases" from #126
2013-03-05 19:57:09 -08:00
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