kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Indicate that single_discussion is optional

Browse source
This commit is contained in:
Bob Van Landuyt 2017-03-09 14:28:57 +01:00
parent f8b5fef9f7
commit 80b67a79f4
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/helpers/issues_helper.rb
View file

@ -134,7 +134,7 @@ module IssuesHelper
options_from_collection_for_select(options, 'name', 'title', params[:due_date]) options_from_collection_for_select(options, 'name', 'title', params[:due_date])
end 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 = merge_request.to_reference
link_text += " (discussion #{single_discussion.first_note.id})" if single_discussion link_text += " (discussion #{single_discussion.first_note.id})" if single_discussion