diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-07 15:06:18 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-07 15:06:18 +0300 |
| commit | 185f428fa5e6123ffa0f29e307523da138e7b028 (patch) | |
| tree | 1d5bb1d4700c0953aed2ad0e5d3515cc7935e550 /app | |
| parent | ab2382923e7a864a3fa27fdf8eeb9b21893b9147 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/concerns/analytics/cycle_analytics/stage.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/concerns/analytics/cycle_analytics/stage.rb b/app/models/concerns/analytics/cycle_analytics/stage.rb index 0c603c2d5e6..0011ba10a9a 100644 --- a/app/models/concerns/analytics/cycle_analytics/stage.rb +++ b/app/models/concerns/analytics/cycle_analytics/stage.rb @@ -7,6 +7,7 @@ module Analytics included do validates :name, presence: true + validates :name, exclusion: { in: Gitlab::Analytics::CycleAnalytics::DefaultStages.names }, if: :custom? validates :start_event_identifier, presence: true validates :end_event_identifier, presence: true validate :validate_stage_event_pairs @@ -15,6 +16,7 @@ module Analytics enum end_event_identifier: Gitlab::Analytics::CycleAnalytics::StageEvents.to_enum, _prefix: :end_event_identifier alias_attribute :custom_stage?, :custom + scope :default_stages, -> { where(custom: false) } end def parent=(_) |