Merge branch 'ce-to-ee-2018-02-21' into 'master'

CE upstream - 2018-02-21 02:17 UTC

See merge request gitlab-org/gitlab-ee!4641

doc/install/requirements.md

@@ -194,3 +194,6 @@ use the CI features.
 We support the current and the previous major release of Firefox, Chrome/Chromium, Safari and Microsoft browsers (Microsoft Edge and Internet Explorer 11).
 
 Each time a new browser version is released, we begin supporting that version and stop supporting the third most recent version.
+
+Note: We do not support running GitLab with JavaScript disabled in the browser and have no plans of supporting that
+in the future because we have features such as Issue Boards which require JavaScript extensively.

doc/user/project/integrations/prometheus_library/kubernetes.md

@@ -45,4 +45,4 @@ These metrics expect an `environment` label of the form `$CI_ENVIRONMENT_SLUG-ca
 | Name | Query |
 | ---- | ----- |
 | Average Memory Usage (MB) | (sum(avg(container_memory_usage_bytes{container_name!="POD",environment="%{ci_environment_slug}-canary"}) without (job))) / count(avg(container_memory_usage_bytes{container_name!="POD",environment="%{ci_environment_slug}-canary"}) without (job)) /1024/1024 |
-| Average CPU Utilization (%) | sum(avg(rate(container_cpu_usage_seconds_total{container_name!="POD",environment="%{ci_environment_slug}-canary"}[2m])) without (job)) * 100 |
\ No newline at end of file
+| Average CPU Utilization (%) | sum(avg(rate(container_cpu_usage_seconds_total{container_name!="POD",environment="%{ci_environment_slug}-canary"}[2m])) without (job)) * 100 |