diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-13 03:08:46 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-13 03:08:46 +0300 |
| commit | 47d1f417f03aca055b2ba49c32bb6fb01c459831 (patch) | |
| tree | 200f05f28369cbf3a34abcb4a3c388558268b86f /app/models | |
| parent | 006e89697dd5165f355afc20fc6bb0cdfa7b381a (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/project.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index b2ac9c99ab6..0ed2510dbf4 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -322,6 +322,7 @@ class Project < ApplicationRecord accepts_nested_attributes_for :error_tracking_setting, update_only: true accepts_nested_attributes_for :metrics_setting, update_only: true, allow_destroy: true accepts_nested_attributes_for :grafana_integration, update_only: true, allow_destroy: true + accepts_nested_attributes_for :prometheus_service, update_only: true delegate :feature_available?, :builds_enabled?, :wiki_enabled?, :merge_requests_enabled?, :forking_enabled?, :issues_enabled?, |