diff options
author | Bob Van Landuyt <bob@gitlab.com> | 2017-03-09 14:28:57 +0100 |
---|---|---|
committer | Bob Van Landuyt <bob@gitlab.com> | 2017-03-13 08:27:52 +0100 |
commit | 80b67a79f45bd728d8eb2980d08004f0d2306a91 (patch) | |
tree | 0802422355cc9e07e049832ee19987de49ccd345 | |
parent | f8b5fef9f7afadb3f63575e05c68d636f809a1cb (diff) | |
download | gitlab-ce-80b67a79f45bd728d8eb2980d08004f0d2306a91.tar.gz |
Indicate that `single_discussion` is optional
-rw-r--r-- | app/helpers/issues_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index 63b6fde60c3..6978b0c89fd 100644 --- a/app/helpers/issues_helper.rb +++ b/app/helpers/issues_helper.rb @@ -134,7 +134,7 @@ module IssuesHelper options_from_collection_for_select(options, 'name', 'title', params[:due_date]) end - def link_to_discussions_to_resolve(merge_request, single_discussion) + def link_to_discussions_to_resolve(merge_request, single_discussion = nil) link_text = merge_request.to_reference link_text += " (discussion #{single_discussion.first_note.id})" if single_discussion |