Commit 9052086d authored by Douwe Maan's avatar Douwe Maan Committed by Rémy Coutable

Merge branch 'issue_13621' into 'master'

Don't repeat labels listed on Labels tab.

Fixes #13622

See merge request !2924
parent 5c8f6ba3
...@@ -2,6 +2,7 @@ Please view this file on the master branch, on stable branches it's out of date. ...@@ -2,6 +2,7 @@ Please view this file on the master branch, on stable branches it's out of date.
v 8.5.2 v 8.5.2
- Fix sidebar overlapping content when screen width was below 1200px - Fix sidebar overlapping content when screen width was below 1200px
- Don't repeat labels listed on Labels tab
- Bring the "branded appearance" feature from EE to CE - Bring the "branded appearance" feature from EE to CE
- Fix error 500 when commenting on a commit - Fix error 500 when commenting on a commit
- Update Rails to 4.2.5.2 - Update Rails to 4.2.5.2
......
...@@ -27,7 +27,7 @@ class Milestone < ActiveRecord::Base ...@@ -27,7 +27,7 @@ class Milestone < ActiveRecord::Base
belongs_to :project belongs_to :project
has_many :issues has_many :issues
has_many :labels, through: :issues has_many :labels, -> { distinct.reorder('labels.title') }, through: :issues
has_many :merge_requests has_many :merge_requests
has_many :participants, through: :issues, source: :assignee has_many :participants, through: :issues, source: :assignee
......
...@@ -13,6 +13,7 @@ Feature: Project Milestone ...@@ -13,6 +13,7 @@ Feature: Project Milestone
Given I visit project "Shop" milestones page Given I visit project "Shop" milestones page
And I click link "v2.2" And I click link "v2.2"
Then I should see the labels "bug", "enhancement" and "feature" Then I should see the labels "bug", "enhancement" and "feature"
And I should see the "bug" label listed only once
@javascript @javascript
Scenario: Listing labels from labels tab Scenario: Listing labels from labels tab
......
...@@ -41,6 +41,12 @@ class Spinach::Features::ProjectMilestone < Spinach::FeatureSteps ...@@ -41,6 +41,12 @@ class Spinach::Features::ProjectMilestone < Spinach::FeatureSteps
end end
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 step 'I click link "v2.2"' do
click_link "v2.2" click_link "v2.2"
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment