mirror of
https://github.com/discourse/discourse.git
synced 2024-11-30 20:54:00 -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 3000, 4000
|
||||||
config.vm.forward_port 1080, 4080 # Mailcatcher
|
config.vm.forward_port 1080, 4080 # Mailcatcher
|
||||||
|
|
||||||
nfs_setting = (RUBY_PLATFORM =~ /darwin/ or
|
nfs_setting = RUBY_PLATFORM =~ /darwin/ || RUBY_PLATFORM =~ /linux/
|
||||||
RUBY_PLATFORM =~ /linux/) ? true : false
|
|
||||||
config.vm.share_folder("v-root", "/vagrant", ".", :nfs => nfs_setting)
|
config.vm.share_folder("v-root", "/vagrant", ".", :nfs => nfs_setting)
|
||||||
|
|
||||||
chef_cookbooks_path = ["chef/cookbooks"]
|
chef_cookbooks_path = ["chef/cookbooks"]
|
||||||
|
@ -5,19 +5,21 @@
|
|||||||
"path": "app",
|
"path": "app",
|
||||||
"folder_exclude_patterns": ["external", "external_production", "images", "imported", "fonts", "defer"]
|
"folder_exclude_patterns": ["external", "external_production", "images", "imported", "fonts", "defer"]
|
||||||
},
|
},
|
||||||
{"path": "config"},
|
{ "path": "config" },
|
||||||
{
|
{
|
||||||
"path": "db",
|
"path": "db",
|
||||||
"file_exclude_patterns": ["*.sqlite3"]
|
"file_exclude_patterns": ["*.sqlite3"]
|
||||||
},
|
},
|
||||||
{"path": "lib"},
|
{ "path": "lib" },
|
||||||
{"path": "script"},
|
{ "path": "script" },
|
||||||
{"path": "cookbooks"},
|
{ "path": "cookbooks" },
|
||||||
{"path": "spec"}
|
{ "path": "spec" }
|
||||||
],
|
],
|
||||||
"settings":
|
"settings":
|
||||||
{
|
{
|
||||||
|
// indentation
|
||||||
"tab_size": 2,
|
"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