Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
308c967d
Commit
308c967d
authored
Feb 02, 2016
by
Zeger-Jan van de Weg
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Validate uniqueness of milestone title per project
Fixes #3903
parent
05519b55
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
1 deletion
+16
-1
CHANGELOG
CHANGELOG
+1
-0
app/models/milestone.rb
app/models/milestone.rb
+1
-1
spec/models/milestone_spec.rb
spec/models/milestone_spec.rb
+14
-0
No files found.
CHANGELOG
View file @
308c967d
...
@@ -35,6 +35,7 @@ v 8.5.0 (unreleased)
...
@@ -35,6 +35,7 @@ v 8.5.0 (unreleased)
- Fixed logo animation on Safari (Roman Rott)
- Fixed logo animation on Safari (Roman Rott)
- Hide remove source branch button when the MR is merged but new commits are pushed (Zeger-Jan van de Weg)
- Hide remove source branch button when the MR is merged but new commits are pushed (Zeger-Jan van de Weg)
- In seach autocomplete show only groups and projects you are member of
- In seach autocomplete show only groups and projects you are member of
- Title for milestones should be unique (Zeger-Jan van de Weg)
v 8.4.4
v 8.4.4
- Update omniauth-saml gem to 1.4.2
- Update omniauth-saml gem to 1.4.2
...
...
app/models/milestone.rb
View file @
308c967d
...
@@ -34,7 +34,7 @@ class Milestone < ActiveRecord::Base
...
@@ -34,7 +34,7 @@ class Milestone < ActiveRecord::Base
scope
:closed
,
->
{
with_state
(
:closed
)
}
scope
:closed
,
->
{
with_state
(
:closed
)
}
scope
:of_projects
,
->
(
ids
)
{
where
(
project_id:
ids
)
}
scope
:of_projects
,
->
(
ids
)
{
where
(
project_id:
ids
)
}
validates
:title
,
presence:
true
validates
:title
,
presence:
true
,
uniqueness:
{
scope: :project_id
}
validates
:project
,
presence:
true
validates
:project
,
presence:
true
strip_attributes
:title
strip_attributes
:title
...
...
spec/models/milestone_spec.rb
View file @
308c967d
...
@@ -33,6 +33,20 @@ describe Milestone, models: true do
...
@@ -33,6 +33,20 @@ describe Milestone, models: true do
let
(
:milestone
)
{
create
(
:milestone
)
}
let
(
:milestone
)
{
create
(
:milestone
)
}
let
(
:issue
)
{
create
(
:issue
)
}
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
describe
"#percent_complete"
do
it
"should not count open issues"
do
it
"should not count open issues"
do
milestone
.
issues
<<
issue
milestone
.
issues
<<
issue
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment