Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-05-01
# Conflicts: # app/helpers/auth_helper.rb # doc/api/discussions.md # lib/api/discussions.rb # spec/helpers/auth_helper_spec.rb # spec/requests/api/discussions_spec.rb [ci skip]
Showing
... | ... | @@ -100,10 +100,11 @@ |
"devDependencies": { | ||
"axios-mock-adapter": "^1.10.0", | ||
"babel-eslint": "^8.0.2", | ||
"babel-plugin-istanbul": "^4.1.5", | ||
"babel-plugin-istanbul": "^4.1.6", | ||
"babel-plugin-rewire": "^1.1.0", | ||
"babel-template": "^6.26.0", | ||
"babel-types": "^6.26.0", | ||
"chalk": "^2.4.1", | ||
"commander": "^2.15.1", | ||
"eslint": "^3.18.0", | ||
"eslint-config-airbnb-base": "^10.0.1", | ||
... | ... | @@ -118,13 +119,13 @@ |
"istanbul": "^0.4.5", | ||
"jasmine-core": "^2.9.0", | ||
"jasmine-jquery": "^2.1.1", | ||
"karma": "^2.0.0", | ||
"karma": "^2.0.2", | ||
"karma-chrome-launcher": "^2.2.0", | ||
"karma-coverage-istanbul-reporter": "^1.4.1", | ||
"karma-coverage-istanbul-reporter": "^1.4.2", | ||
"karma-jasmine": "^1.1.1", | ||
"karma-mocha-reporter": "^2.2.5", | ||
"karma-sourcemap-loader": "^0.3.7", | ||
"karma-webpack": "2.0.7", | ||
"karma-webpack": "3.0.0", | ||
"nodemon": "^1.15.1", | ||
"prettier": "1.11.1", | ||
"webpack-dev-server": "^2.11.2" | ||
... | ... |
This diff is collapsed.
Please register or sign in to comment