diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-02-02 18:09:20 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-02-02 18:09:20 +0000 |
| commit | 3997e6723c78e6c374764f5f24180ce8114592f5 (patch) | |
| tree | 93e5270c9a95a124fd8e53b5dfe2411ba3654b3f | |
| parent | 4615d0995117e8369acc7b1f5f2b8497426ba5c7 (diff) | |
| parent | 161d74f1a6e58dae29ad6ee37b7d70cdb4999cc4 (diff) | |
| download | gitlab-ce-3997e6723c78e6c374764f5f24180ce8114592f5.tar.gz | |
Merge branch 'group-label-sidebar-link' into 'master'
Fixed group label in issuable sidebar
Closes #27253
See merge request !8924
| -rw-r--r-- | app/views/shared/issuable/_sidebar.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/group-label-sidebar-link.yml | 4 | ||||
| -rw-r--r-- | spec/features/issues/group_label_sidebar_spec.rb | 21 |
3 files changed, 26 insertions, 1 deletions
diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml index ec9bcaf63dd..10fa7901874 100644 --- a/app/views/shared/issuable/_sidebar.html.haml +++ b/app/views/shared/issuable/_sidebar.html.haml @@ -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 diff --git a/changelogs/unreleased/group-label-sidebar-link.yml b/changelogs/unreleased/group-label-sidebar-link.yml new file mode 100644 index 00000000000..c11c2d4ede1 --- /dev/null +++ b/changelogs/unreleased/group-label-sidebar-link.yml @@ -0,0 +1,4 @@ +--- +title: Fixed group label links in issue/merge request sidebar +merge_request: +author: diff --git a/spec/features/issues/group_label_sidebar_spec.rb b/spec/features/issues/group_label_sidebar_spec.rb new file mode 100644 index 00000000000..fc8515cfe9b --- /dev/null +++ b/spec/features/issues/group_label_sidebar_spec.rb @@ -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 |