codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-23 15:48:11 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

add new vagrant box "brunchv2", revert npm package upgrades in package.json

Browse source
This commit is contained in:
duybkict 2016-05-26 15:44:35 +07:00 committed by Matt Lott
parent e3c2947e2d
commit 877bea35e7
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Vagrantfile vendored
View file

@ -19,6 +19,10 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
config.vm.define "default" do |default| config.vm.define "default" do |default|
default.vm.provision "shell", path: "scripts/vagrant/core/provision.sh", privileged: false default.vm.provision "shell", path: "scripts/vagrant/core/provision.sh", privileged: false
<<<<<<< HEAD
=======
>>>>>>> f148776... add new vagrant box "brunchv2", revert npm package upgrades in package.json
end end
config.vm.define "brunchv2", autostart: false do |brunchv2| config.vm.define "brunchv2", autostart: false do |brunchv2|

12
package.json
View file

@ -93,11 +93,11 @@
"devDependencies": { "devDependencies": {
"after-brunch": "0.0.5", "after-brunch": "0.0.5",
"assetsmanager-brunch": "^1.8.1", "assetsmanager-brunch": "^1.8.1",
"auto-reload-brunch": ">=2.0.0", "auto-reload-brunch": "^1.8.1",
"bower": "~1.6.4", "bower": "~1.6.4",
"brunch": ">=2.0.0", "brunch": "^1.8.5",
"coffee-script-brunch": ">=2.0.0", "coffee-script-brunch": "^1.8.3",
"coffeelint-brunch": ">=2.0.0", "coffeelint-brunch": "^1.7.1",
"commonjs-require-definition": "0.2.0", "commonjs-require-definition": "0.2.0",
"compressible": "~1.0.1", "compressible": "~1.0.1",
"country-data": "0.0.24", "country-data": "0.0.24",
@ -107,7 +107,7 @@
"http-proxy": "^1.13.2", "http-proxy": "^1.13.2",
"jade-brunch": "1.7.5", "jade-brunch": "1.7.5",
"jasmine": "^2.4.1", "jasmine": "^2.4.1",
"javascript-brunch": ">=2.0.0", "javascript-brunch": "> 1.0 < 1.8",
"karma": "~0.13", "karma": "~0.13",
"karma-chrome-launcher": "~0.1.2", "karma-chrome-launcher": "~0.1.2",
"karma-coffee-preprocessor": "~0.1.2", "karma-coffee-preprocessor": "~0.1.2",
@ -123,7 +123,7 @@
"nodemon": "1.6.1", "nodemon": "1.6.1",
"parse-domain": "^0.2.1", "parse-domain": "^0.2.1",
"requirejs": "~2.1.10", "requirejs": "~2.1.10",
"sass-brunch": ">=2.0.0", "sass-brunch": "https://github.com/basicer/sass-brunch-bleeding/archive/1.9.1-bleeding.tar.gz",
"telepath-brunch": "https://github.com/nwinter/telepath-brunch/tarball/master", "telepath-brunch": "https://github.com/nwinter/telepath-brunch/tarball/master",
"uglify-js": "^2.5.0" "uglify-js": "^2.5.0"
}, },