app/models/project.rb · 26bf9ae5a57f4763fb23050ce02ddf2db13afc1e · nexedi / gitlab-ce

Merge remote-tracking branch 'upstream/master' into pawel/prometheus-business-metrics-ee-2273 · 3c822c7a

Pawel Chojnacki authored Mar 07, 2018

# Conflicts:
#	app/controllers/projects/prometheus/metrics_controller.rb
#	app/models/project_services/prometheus_service.rb
#	spec/models/project_services/prometheus_service_spec.rb

3c822c7a

project.rb 56.2 KB

Replace project.rb