From d35df0ad158c14cb28f583f4b26c4196ef23a3f7 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 4 May 2020 10:03:30 +0000 Subject: Add latest changes from gitlab-org/gitlab@12-10-stable-ee --- app/services/discussions/capture_diff_note_position_service.rb | 1 + app/services/projects/create_service.rb | 4 ++++ 2 files changed, 5 insertions(+) (limited to 'app/services') diff --git a/app/services/discussions/capture_diff_note_position_service.rb b/app/services/discussions/capture_diff_note_position_service.rb index 273a60f7e55..8f12470d9e8 100644 --- a/app/services/discussions/capture_diff_note_position_service.rb +++ b/app/services/discussions/capture_diff_note_position_service.rb @@ -17,6 +17,7 @@ module Discussions return unless result position = result[:position] + return unless position # Currently position data is copied across all notes of a discussion # It makes sense to store a position only for the first note instead diff --git a/app/services/projects/create_service.rb b/app/services/projects/create_service.rb index cef86e9763c..429ae905e3d 100644 --- a/app/services/projects/create_service.rb +++ b/app/services/projects/create_service.rb @@ -173,6 +173,10 @@ module Projects def create_prometheus_service service = @project.find_or_initialize_service(::PrometheusService.to_param) + # If the service has already been inserted in the database, that + # means it came from a template, and there's nothing more to do. + return if service.persisted? + if service.prometheus_available? service.save! else -- cgit v1.2.3