# Conflicts:
#	app/assets/javascripts/pipelines/components/graph/graph_component.vue
#	app/assets/javascripts/pipelines/components/graph/stage_column_component.vue
#	app/assets/stylesheets/pages/environments.scss
#	config/prometheus/additional_metrics.yml
#	lib/gitlab/git/repository.rb
#	spec/lib/gitlab/git_access_spec.rb
#	spec/migrations/remove_soft_removed_objects_spec.rb
#	spec/spec_helper.rb

[ci skip]

CE upstream - 2018-04-06 15:28 UTC

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

Fix the reCAPTCHA spec failures by not rendering the widget in test mode

Closes #45138

See merge request gitlab-org/gitlab-ce!18235

Resolve "Wrong empty state for cancelled build, hides existing logs!"

Closes #42568

See merge request gitlab-org/gitlab-ce!17646

Add summary statistics to the prometheus dashboard - EE version

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

Add CPU/Memory totals to Kubernetes system metrics

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

Add Kubernetes CPU/Mem usage totals

See merge request gitlab-org/gitlab-ce!17731

We've seen changes in behavior in the reCAPTCHA widget that led to test failures.
To avoid these issues, don't render the widget at all in test mode.

Closes #45138

Repository checksum calculation is handled by Gitaly when feature is enabled

See merge request gitlab-org/gitlab-ce!18210

Repository checksum calculation is handled by Gitaly when feature is enabled

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

We've seen changes in behavior in the reCAPTCHA widget that led to test failures.
To avoid these issues, don't render the widget at all in test mode.

Closes #45138

5017 rename sast container to container scanning

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

Add summary statistics to the prometheus dashboard

Closes #43973

See merge request gitlab-org/gitlab-ce!17921

Add Go to supported languages list for SAST

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

Merge branch '5420-geo-secondary-repository-verification-gets-stuck-after-1000-failed-repositories' into 'master'

Geo repository verification gets stuck after 1000 failed repositories

Closes #5420

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

'sha_attribute' causes error when Geo is not enabled

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