Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce_upstream[ci skip]
Showing
... | @@ -93,7 +93,7 @@ gem 'kaminari', '~> 1.0' | ... | @@ -93,7 +93,7 @@ gem 'kaminari', '~> 1.0' |
gem 'hamlit', '~> 2.6.1' | gem 'hamlit', '~> 2.6.1' | ||
# Files attachments | # Files attachments | ||
gem 'carrierwave', '~> 1.1' | gem 'carrierwave', '~> 1.2' | ||
# Drag and Drop UI | # Drag and Drop UI | ||
gem 'dropzonejs-rails', '~> 0.7.1' | gem 'dropzonejs-rails', '~> 0.7.1' | ||
... | @@ -414,7 +414,7 @@ group :ed25519 do | ... | @@ -414,7 +414,7 @@ group :ed25519 do |
end | end | ||
# Gitaly GRPC client | # Gitaly GRPC client | ||
gem 'gitaly-proto', '~> 0.48.0', require: 'gitaly' | gem 'gitaly-proto', '~> 0.51.0', require: 'gitaly' | ||
gem 'toml-rb', '~> 0.3.15', require: false | gem 'toml-rb', '~> 0.3.15', require: false | ||
... | ... |
... | @@ -37,6 +37,7 @@ | ... | @@ -37,6 +37,7 @@ |
"eslint-plugin-html": "^2.0.1", | "eslint-plugin-html": "^2.0.1", | ||
"exports-loader": "^0.6.4", | "exports-loader": "^0.6.4", | ||
"file-loader": "^0.11.1", | "file-loader": "^0.11.1", | ||
"fuzzaldrin-plus": "^0.5.0", | |||
"imports-loader": "^0.7.1", | "imports-loader": "^0.7.1", | ||
"jed": "^1.1.1", | "jed": "^1.1.1", | ||
"jquery": "^2.2.1", | "jquery": "^2.2.1", | ||
... | ... |
qa/qa/runtime/scenario.rb
0 → 100644
Please register or sign in to comment