mirror of
https://github.com/discourse/discourse.git
synced 2024-11-30 12:43:54 -06:00
Merge pull request #273 from ZogStriP/misc
updated sublime-project & vagrant file
This commit is contained in:
commit
f9acff3579
3
Vagrantfile
vendored
3
Vagrantfile
vendored
@ -25,8 +25,7 @@ Vagrant::Config.run do |config|
|
||||
config.vm.forward_port 3000, 4000
|
||||
config.vm.forward_port 1080, 4080 # Mailcatcher
|
||||
|
||||
nfs_setting = (RUBY_PLATFORM =~ /darwin/ or
|
||||
RUBY_PLATFORM =~ /linux/) ? true : false
|
||||
nfs_setting = RUBY_PLATFORM =~ /darwin/ || RUBY_PLATFORM =~ /linux/
|
||||
config.vm.share_folder("v-root", "/vagrant", ".", :nfs => nfs_setting)
|
||||
|
||||
chef_cookbooks_path = ["chef/cookbooks"]
|
||||
|
@ -17,7 +17,9 @@
|
||||
],
|
||||
"settings":
|
||||
{
|
||||
// indentation
|
||||
"tab_size": 2,
|
||||
"translate_tabs_to_spaces": true
|
||||
"translate_tabs_to_spaces": true,
|
||||
"trim_trailing_white_space_on_save": true,
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue
Block a user