diff options
| -rw-r--r-- | app/models/issue.rb | 4 | ||||
| -rw-r--r-- | app/views/milestones/show.html.haml | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/app/models/issue.rb b/app/models/issue.rb index 6ad11e8f7ba..ee92d944b03 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -28,8 +28,8 @@ class Issue < ActiveRecord::Base scope :cared, ->(user) { where(assignee_id: user) } scope :authored, ->(user) { where(author_id: user) } scope :open_for, ->(user) { opened.assigned(user) } - scope :assigned, where("assignee_id IS NOT NULL") - scope :unassigned, where("assignee_id IS NULL") + scope :assigned, -> { where("assignee_id IS NOT NULL") } + scope :unassigned, -> { where("assignee_id IS NULL") } state_machine :state, initial: :opened do event :close do diff --git a/app/views/milestones/show.html.haml b/app/views/milestones/show.html.haml index 36dbed45ddf..9f665206acb 100644 --- a/app/views/milestones/show.html.haml +++ b/app/views/milestones/show.html.haml @@ -56,9 +56,9 @@ .row - =render(partial: 'issues', :locals => {title: 'Unstarted Issues (open and unassigned)', issues: @issues.opened.unassigned}) + = render(partial: 'issues', locals: {title: 'Unstarted Issues (open and unassigned)', issues: @issues.opened.unassigned}) - =render(partial: 'issues', :locals => {title: 'Ongoing Issues (open and assigned)', issues: @issues.opened.assigned}) + = render(partial: 'issues', locals: {title: 'Ongoing Issues (open and assigned)', issues: @issues.opened.assigned}) .row .span6 @@ -75,7 +75,7 @@ – = link_to_gfm truncate(merge_request.title, length: 60), [@project, merge_request] - =render(:partial => 'issues', :locals => {title: 'Completed Issues (closed)', issues: @issues.closed}) + = render(:partial => 'issues', locals: {title: 'Completed Issues (closed)', issues: @issues.closed}) %hr %h6 Participants: |