Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-09-16 18:06:26 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2019-09-16 18:06:26 +0300
commit84727c8209a4412e21111a07f99b0438b03232de (patch)
tree1fcfa02b01548c3cdc561186870a1c807f227f0b /app/models/milestone_release.rb
parentd2798d607e11e0ebae83ae909404834388733428 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/milestone_release.rb')
-rw-r--r--app/models/milestone_release.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/models/milestone_release.rb b/app/models/milestone_release.rb
index c8743a8cad8..f7127df339d 100644
--- a/app/models/milestone_release.rb
+++ b/app/models/milestone_release.rb
@@ -4,9 +4,11 @@ class MilestoneRelease < ApplicationRecord
belongs_to :milestone
belongs_to :release
- validates :milestone_id, uniqueness: { scope: [:release_id] }
validate :same_project_between_milestone_and_release
+ # Keep until 2019-11-29
+ self.ignored_columns += %i[id]
+
private
def same_project_between_milestone_and_release