diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-09 11:11:52 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-09 11:11:52 +0000 |
commit | e80df8f234a26271c77358c36662b957b23cbcaf (patch) | |
tree | 5de3b5e824a74fe517b579853485773033639e35 /app | |
parent | 95138a9c16a2d1905354d0f46381b3822b37863d (diff) | |
parent | 4bfd06e60e22a8100eddc2391d4842a8b6e53a6f (diff) | |
download | gitlab-ce-e80df8f234a26271c77358c36662b957b23cbcaf.tar.gz |
Merge branch '33381-display-issue-state-in-mr-widget-issue-links' into 'master'
Display issue state in issue links section of merge request widget
Closes #33381
See merge request !12021
Diffstat (limited to 'app')
-rw-r--r-- | app/presenters/merge_request_presenter.rb | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/app/presenters/merge_request_presenter.rb b/app/presenters/merge_request_presenter.rb index 0db9e31031c..8bf35953d29 100644 --- a/app/presenters/merge_request_presenter.rb +++ b/app/presenters/merge_request_presenter.rb @@ -110,12 +110,24 @@ class MergeRequestPresenter < Gitlab::View::Presenter::Delegated end def closing_issues_links - markdown issues_sentence(project, closing_issues), pipeline: :gfm, author: author, project: project + markdown( + issues_sentence(project, closing_issues), + pipeline: :gfm, + author: author, + project: project, + issuable_state_filter_enabled: true + ) end def mentioned_issues_links mentioned_issues = issues_mentioned_but_not_closing(current_user) - markdown issues_sentence(project, mentioned_issues), pipeline: :gfm, author: author, project: project + markdown( + issues_sentence(project, mentioned_issues), + pipeline: :gfm, + author: author, + project: project, + issuable_state_filter_enabled: true + ) end def assign_to_closing_issues_link |