Merge branch 'master' into list-multiple-clusters
* master: (22 commits) static-analysis fix refactored the hashed repository name removed 'only once' from the docs static analysis fix added changelog ignore hashed repositories when doing rake gitlab:cleanup:dirs Update prometheus Gem to fix compilation on centos 6 duo to GCC not recognizing `std=c11` option Add a feedback mechanism to `package-qa` manual action Update svg external dependency Drastically improve project search performance by no longer searching namespace name Deduplicate protected ref human_access_levels Fix ProtectedBranch access level validations Address feedback for AWS Runner autoscale article Clarify usage of Runner limit and AWS tags Finish rest of the sections Finish all sections except docker.machine Add runners.cache section Add Runner registration info Clear up sections Add skeleton ...
Showing
... | @@ -245,7 +245,7 @@ gem 'font-awesome-rails', '~> 4.7' | ... | @@ -245,7 +245,7 @@ gem 'font-awesome-rails', '~> 4.7' |
gem 'gemojione', '~> 3.3' | gem 'gemojione', '~> 3.3' | ||
gem 'gon', '~> 6.1.0' | gem 'gon', '~> 6.1.0' | ||
gem 'jquery-atwho-rails', '~> 1.3.2' | gem 'jquery-atwho-rails', '~> 1.3.2' | ||
gem 'jquery-rails', '~> 4.1.0' | gem 'jquery-rails', '~> 4.3.1' | ||
gem 'request_store', '~> 1.3' | gem 'request_store', '~> 1.3' | ||
gem 'select2-rails', '~> 3.5.9' | gem 'select2-rails', '~> 3.5.9' | ||
gem 'virtus', '~> 1.0.1' | gem 'virtus', '~> 1.0.1' | ||
... | @@ -283,7 +283,7 @@ group :metrics do | ... | @@ -283,7 +283,7 @@ group :metrics do |
gem 'influxdb', '~> 0.2', require: false | gem 'influxdb', '~> 0.2', require: false | ||
# Prometheus | # Prometheus | ||
gem 'prometheus-client-mmap', '~> 0.7.0.beta36' | gem 'prometheus-client-mmap', '~> 0.7.0.beta37' | ||
gem 'raindrops', '~> 0.18' | gem 'raindrops', '~> 0.18' | ||
end | end | ||
... | ... |
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
... | @@ -42,8 +42,8 @@ | ... | @@ -42,8 +42,8 @@ |
"fuzzaldrin-plus": "^0.5.0", | "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.4", | ||
"jquery-ujs": "^1.2.1", | "jquery-ujs": "1.2.2", | ||
"js-cookie": "^2.1.3", | "js-cookie": "^2.1.3", | ||
"jszip": "^3.1.3", | "jszip": "^3.1.3", | ||
"jszip-utils": "^0.0.2", | "jszip-utils": "^0.0.2", | ||
... | @@ -77,7 +77,7 @@ | ... | @@ -77,7 +77,7 @@ |
"webpack-stats-plugin": "^0.1.5" | "webpack-stats-plugin": "^0.1.5" | ||
}, | }, | ||
"devDependencies": { | "devDependencies": { | ||
"@gitlab-org/gitlab-svgs": "^1.0.2", | "@gitlab-org/gitlab-svgs": "^1.1.1", | ||
"babel-plugin-istanbul": "^4.1.5", | "babel-plugin-istanbul": "^4.1.5", | ||
"eslint": "^3.10.1", | "eslint": "^3.10.1", | ||
"eslint-config-airbnb-base": "^10.0.1", | "eslint-config-airbnb-base": "^10.0.1", | ||
... | ... |
Please register or sign in to comment