Merge branch 'ce-to-ee-2018-05-09' into 'master'
CE upstream - 2018-05-09 18:24 UTC Closes gitlab-development-kit#348 See merge request gitlab-org/gitlab-ee!5642
Showing
... | ... | @@ -228,9 +228,6 @@ gem 'ruby-fogbugz', '~> 0.2.1' |
# Kubernetes integration | ||
gem 'kubeclient', '~> 3.0' | ||
# d3 | ||
gem 'd3_rails', '~> 3.5.0' | ||
# Sanitize user input | ||
gem 'sanitize', '~> 2.0' | ||
gem 'babosa', '~> 1.0.2' | ||
... | ... |
... | ... | @@ -98,7 +98,7 @@ |
"worker-loader": "^1.1.1" | ||
}, | ||
"devDependencies": { | ||
"axios-mock-adapter": "^1.10.0", | ||
"axios-mock-adapter": "^1.15.0", | ||
"babel-eslint": "^8.0.2", | ||
"babel-plugin-istanbul": "^4.1.6", | ||
"babel-plugin-rewire": "^1.1.0", | ||
... | ... |
Please register or sign in to comment