Merge branch 'group-label-sidebar-link' into 'master'

Fixed group label in issuable sidebar

Closes #27253

See merge request !8924
This commit is contained in:
Sean McGivern 2017-02-02 18:09:20 +00:00
commit 3997e6723c
3 changed files with 26 additions and 1 deletions

View file

@ -130,7 +130,7 @@
.value.issuable-show-labels.hide-collapsed{ class: ("has-labels" if selected_labels.any?) }
- if selected_labels.any?
- selected_labels.each do |label|
= link_to_label(label, type: issuable.to_ability_name)
= link_to_label(label, subject: issuable.project, type: issuable.to_ability_name)
- else
%span.no-value None
.selectbox.hide-collapsed

View file

@ -0,0 +1,4 @@
---
title: Fixed group label links in issue/merge request sidebar
merge_request:
author:

View file

@ -0,0 +1,21 @@
require 'rails_helper'
describe 'Group label on issue', :feature do
it 'renders link to the project issues page' do
group = create(:group)
project = create(:empty_project, :public, namespace: group)
feature = create(:group_label, group: group, title: 'feature')
issue = create(:labeled_issue, project: project, labels: [feature])
label_link = namespace_project_issues_path(
project.namespace,
project,
label_name: [feature.name]
)
visit namespace_project_issue_path(project.namespace, project, issue)
link = find('.issuable-show-labels a')
expect(link[:href]).to eq(label_link)
end
end