Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
80b67a79
Commit
80b67a79
authored
Mar 09, 2017
by
Bob Van Landuyt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Indicate that `single_discussion` is optional
parent
f8b5fef9
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
app/helpers/issues_helper.rb
app/helpers/issues_helper.rb
+1
-1
No files found.
app/helpers/issues_helper.rb
View file @
80b67a79
...
@@ -134,7 +134,7 @@ module IssuesHelper
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment