Merge branch 'master' into 'projects-r-s'
# Conflicts: # app/assets/javascripts/dispatcher.js
Showing
... | ... | @@ -341,10 +341,10 @@ group :development, :test do |
gem 'spring-commands-rspec', '~> 1.0.4' | ||
gem 'spring-commands-spinach', '~> 1.1.0' | ||
gem 'gitlab-styles', '~> 2.2.0', require: false | ||
gem 'gitlab-styles', '~> 2.3', require: false | ||
# Pin these dependencies, otherwise a new rule could break the CI pipelines | ||
gem 'rubocop', '~> 0.52.0' | ||
gem 'rubocop-rspec', '~> 1.20.1' | ||
gem 'rubocop', '~> 0.52.1' | ||
gem 'rubocop-rspec', '~> 1.22.1' | ||
gem 'scss_lint', '~> 0.56.0', require: false | ||
gem 'haml_lint', '~> 0.26.0', require: false | ||
... | ... |
... | ... | @@ -102,13 +102,13 @@ |
"istanbul": "^0.4.5", | ||
"jasmine-core": "^2.6.3", | ||
"jasmine-jquery": "^2.1.1", | ||
"karma": "^1.7.0", | ||
"karma-chrome-launcher": "^2.1.1", | ||
"karma-coverage-istanbul-reporter": "^0.2.0", | ||
"karma-jasmine": "^1.1.0", | ||
"karma-mocha-reporter": "^2.2.2", | ||
"karma": "^2.0.0", | ||
"karma-chrome-launcher": "^2.2.0", | ||
"karma-coverage-istanbul-reporter": "^1.3.3", | ||
"karma-jasmine": "^1.1.1", | ||
"karma-mocha-reporter": "^2.2.5", | ||
"karma-sourcemap-loader": "^0.3.7", | ||
"karma-webpack": "^2.0.4", | ||
"karma-webpack": "2.0.7", | ||
"nodemon": "^1.11.0", | ||
"prettier": "1.9.2", | ||
"webpack-dev-server": "^2.6.1" | ||
... | ... |
此差异已折叠。
想要评论请 注册 或 登录