BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
a297e440
Commit
a297e440
authored
Feb 29, 2016
by
Douwe Maan
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'issue_13621' into 'master'
Don't repeat labels listed on Labels tab. Fixes #13622 See merge request !2924
parents
9a7690f9
3d96bfaa
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
1 deletion
+8
-1
milestone.rb
app/models/milestone.rb
+1
-1
milestone.feature
features/project/milestone.feature
+1
-0
project_milestone.rb
features/steps/project/project_milestone.rb
+6
-0
No files found.
app/models/milestone.rb
View file @
a297e440
...
...
@@ -27,7 +27,7 @@ class Milestone < ActiveRecord::Base
belongs_to
:project
has_many
:issues
has_many
:labels
,
through: :issues
has_many
:labels
,
->
{
distinct
.
reorder
(
'labels.title'
)
},
through: :issues
has_many
:merge_requests
has_many
:participants
,
through: :issues
,
source: :assignee
...
...
features/project/milestone.feature
View file @
a297e440
...
...
@@ -13,6 +13,7 @@ Feature: Project Milestone
Given
I visit project
"Shop"
milestones page
And
I click link
"v2.2"
Then
I should see the labels
"bug"
,
"enhancement"
and
"feature"
And
I should see the
"bug"
label listed only once
@javascript
Scenario
:
Listing labels from labels tab
...
...
features/steps/project/project_milestone.rb
View file @
a297e440
...
...
@@ -41,6 +41,12 @@ class Spinach::Features::ProjectMilestone < Spinach::FeatureSteps
end
end
step
'I should see the "bug" label listed only once'
do
page
.
within
(
'#tab-labels'
)
do
expect
(
page
).
to
have_content
(
'bug'
,
count:
1
)
end
end
step
'I click link "v2.2"'
do
click_link
"v2.2"
end
...
...
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