diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-05 21:08:13 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-05 21:08:13 +0000 |
commit | d3c29eae5c389e36d4751539fad0462053fb2b20 (patch) | |
tree | cc3ae497193f9334d0bc6ee4224637102f6e0d4e /app/services/projects | |
parent | ad4dbe36445360521fc73a57df13bc8f12eeaa92 (diff) | |
download | gitlab-ce-d3c29eae5c389e36d4751539fad0462053fb2b20.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/projects')
-rw-r--r-- | app/services/projects/create_service.rb | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/app/services/projects/create_service.rb b/app/services/projects/create_service.rb index 7bf68e7d315..cef86e9763c 100644 --- a/app/services/projects/create_service.rb +++ b/app/services/projects/create_service.rb @@ -98,6 +98,7 @@ module Projects setup_authorizations current_user.invalidate_personal_projects_count + create_prometheus_service create_readme if @initialize_with_readme end @@ -169,6 +170,20 @@ module Projects end # rubocop: enable CodeReuse/ActiveRecord + def create_prometheus_service + service = @project.find_or_initialize_service(::PrometheusService.to_param) + + if service.prometheus_available? + service.save! + else + @project.prometheus_service = nil + end + + rescue ActiveRecord::RecordInvalid => e + Gitlab::ErrorTracking.track_exception(e, extra: { project_id: project.id }) + @project.prometheus_service = nil + end + def set_project_name_from_path # Set project name from path if @project.name.present? && @project.path.present? |