Commit 90910331 authored by Clement Ho's avatar Clement Ho

Merge branch 'restored-issue-weight' into 'master'

Added back weight icon on issue rows

Closes #1739

See merge request !1250
parents 904981f7 288724e7
...@@ -41,6 +41,11 @@ ...@@ -41,6 +41,11 @@
   
%span.task-status %span.task-status
= issue.task_status = issue.task_status
- if issue.weight
 
%span
= icon('balance-scale')
= issue.weight
.pull-right.issue-updated-at .pull-right.issue-updated-at
%span updated #{time_ago_with_tooltip(issue.updated_at, placement: 'bottom', html_class: 'issue_update_ago')} %span updated #{time_ago_with_tooltip(issue.updated_at, placement: 'bottom', html_class: 'issue_update_ago')}
---
title: Added back weight in issue rows on issue list
merge_request:
author:
...@@ -146,6 +146,17 @@ describe 'Issues', feature: true do ...@@ -146,6 +146,17 @@ describe 'Issues', feature: true do
expect(page).to have_content 'foobar' expect(page).to have_content 'foobar'
expect(page.all('.no-comments').first.text).to eq "0" expect(page.all('.no-comments').first.text).to eq "0"
end end
it 'shows weight on issue row' do
create(:issue, author: @user, project: project, weight: 2)
visit namespace_project_issues_path(project.namespace, project)
page.within(first('.issue-info')) do
expect(page).to have_selector('.fa-balance-scale')
expect(page).to have_content(2)
end
end
end end
describe 'Filter issue' do describe 'Filter issue' do
......
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