From eabf8fd774fef6a54903e5141138f47bdafeb331 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 5 Feb 2020 15:08:48 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/models/sentry_issue.rb | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'app/models/sentry_issue.rb') diff --git a/app/models/sentry_issue.rb b/app/models/sentry_issue.rb index 1325bce6c43..30f4026e633 100644 --- a/app/models/sentry_issue.rb +++ b/app/models/sentry_issue.rb @@ -5,13 +5,22 @@ class SentryIssue < ApplicationRecord validates :issue, uniqueness: true, presence: true validates :sentry_issue_identifier, presence: true + validate :ensure_sentry_issue_identifier_is_unique_per_project after_create_commit :enqueue_sentry_sync_job def self.for_project_and_identifier(project, identifier) joins(:issue) .where(issues: { project_id: project.id }) - .find_by_sentry_issue_identifier(identifier) + .where(sentry_issue_identifier: identifier) + .order('issues.created_at').last + end + + def ensure_sentry_issue_identifier_is_unique_per_project + if issue && self.class.for_project_and_identifier(issue.project, sentry_issue_identifier).present? + # Custom message because field is hidden + errors.add(:_, _('is already associated to a GitLab Issue. New issue will not be associated.')) + end end def enqueue_sentry_sync_job -- cgit v1.2.3