Merge branch 'zj/gitlab-ce-unique-milestone-title-per-project'

3 files changed, 16 insertions, 1 deletions

diff --git a/CHANGELOG b/CHANGELOG
index c0562feafca..b08aa4fb925 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -41,6 +41,7 @@ v 8.5.0 (unreleased)
   - In seach autocomplete show only groups and projects you are member of
   - Fix: init.d script not working on OS X
   - Faster snippet search
+  - Title for milestones should be unique (Zeger-Jan van de Weg)
 
 v 8.4.4
   - Update omniauth-saml gem to 1.4.2
diff --git a/app/models/milestone.rb b/app/models/milestone.rb
index c9a0ad8b9b6..9c4476c768e 100644
--- a/app/models/milestone.rb
+++ b/app/models/milestone.rb
@@ -34,7 +34,7 @@ class Milestone < ActiveRecord::Base
   scope :closed, -> { with_state(:closed) }
   scope :of_projects, ->(ids) { where(project_id: ids) }
 
-  validates :title, presence: true
+  validates :title, presence: true, uniqueness: { scope: :project_id }
   validates :project, presence: true
 
   strip_attributes :title
diff --git a/spec/models/milestone_spec.rb b/spec/models/milestone_spec.rb
index 30a71987d86..1b1380ce4e2 100644
--- a/spec/models/milestone_spec.rb
+++ b/spec/models/milestone_spec.rb
@@ -33,6 +33,20 @@ describe Milestone, models: true do
   let(:milestone) { create(:milestone) }
   let(:issue) { create(:issue) }
 
+  describe "unique milestone title per project" do
+    it "shouldn't accept the same title in a project twice" do
+      new_milestone = Milestone.new(project: milestone.project, title: milestone.title)
+      expect(new_milestone).not_to be_valid
+    end
+
+    it "should accept the same title in another project" do
+      project = build(:project)
+      new_milestone = Milestone.new(project: project, title: milestone.title)
+
+      expect(new_milestone).to be_valid
+    end
+  end
+
   describe "#percent_complete" do
     it "should not count open issues" do
       milestone.issues << issue