Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce_upstream
Showing
... | ... | @@ -162,7 +162,7 @@ gem 'acts-as-taggable-on', '~> 4.0' |
gem 'sidekiq', '~> 5.0' | ||
gem 'sidekiq-cron', '~> 0.6.0' | ||
gem 'redis-namespace', '~> 1.5.2' | ||
gem 'sidekiq-limit_fetch', '~> 3.4' | ||
gem 'sidekiq-limit_fetch', '~> 3.4', require: false | ||
# Cron Parser | ||
gem 'rufus-scheduler', '~> 3.4' | ||
... | ... | @@ -299,7 +299,7 @@ group :metrics do |
gem 'influxdb', '~> 0.2', require: false | ||
# Prometheus | ||
gem 'prometheus-client-mmap', '~>0.7.0.beta11' | ||
gem 'prometheus-client-mmap', '~>0.7.0.beta12' | ||
gem 'raindrops', '~> 0.18' | ||
end | ||
... | ... | @@ -417,7 +417,7 @@ group :ed25519 do |
end | ||
# Gitaly GRPC client | ||
gem 'gitaly', '~> 0.27.0' | ||
gem 'gitaly', '~> 0.29.0' | ||
gem 'toml-rb', '~> 0.3.15', require: false | ||
... | ... |
doc/api/ci/README.md
deleted
100644 → 0
doc/api/ci/builds.md
deleted
100644 → 0
doc/ci/api/README.md
deleted
100644 → 0
doc/ci/api/builds.md
deleted
100644 → 0
259 KB
36.2 KB
302 KB
276 KB
318 KB
lib/ci/api/api.rb
deleted
100644 → 0
... | ... | @@ -20,8 +20,12 @@ |
"babel-preset-latest": "^6.24.0", | ||
"babel-preset-stage-2": "^6.22.0", | ||
"bootstrap-sass": "^3.3.6", | ||
<<<<<<< HEAD | ||
"clipboard": "^1.6.1", | ||
"compression-webpack-plugin": "^0.3.2", | ||
======= | ||
"compression-webpack-plugin": "^1.0.0", | ||
>>>>>>> 539ed0a6375d5bb6d734e688b801373e4b8006f9 | ||
"copy-webpack-plugin": "^4.0.1", | ||
"core-js": "^2.4.1", | ||
"cropper": "^2.3.0", | ||
... | ... | @@ -64,7 +68,7 @@ |
"vue-loader": "^11.3.4", | ||
"vue-resource": "^1.3.4", | ||
"vue-template-compiler": "^2.2.6", | ||
"webpack": "^3.5.4", | ||
"webpack": "^3.5.5", | ||
"webpack-bundle-analyzer": "^2.8.2", | ||
"webpack-stats-plugin": "^0.1.5" | ||
}, | ||
... | ... |
spec/models/ci/stage_spec.rb
0 → 100644