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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
afcc8135
Commit
afcc8135
authored
Jun 14, 2019
by
Michel Engelen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
replaced string `discussion` with `thread` in issuable-form template
parent
dd6747c2
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
app/views/shared/issuable/_form.html.haml
app/views/shared/issuable/_form.html.haml
+3
-3
No files found.
app/views/shared/issuable/_form.html.haml
View file @
afcc8135
...
...
@@ -48,13 +48,13 @@
=
hidden_field_tag
'merge_request_to_resolve_discussions_of'
,
@merge_request_to_resolve_discussions_of
.
iid
-
if
@discussion_to_resolve
=
hidden_field_tag
'discussion_to_resolve'
,
@discussion_to_resolve
.
id
Creating this issue will resolve the
discussion
in
Creating this issue will resolve the
thread
in
-
else
Creating this issue will resolve all
discussion
s in
Creating this issue will resolve all
thread
s in
=
link_to_discussions_to_resolve
(
@merge_request_to_resolve_discussions_of
,
@discussion_to_resolve
)
-
else
The
=
@discussion_to_resolve
?
'
discussion'
:
'discussion
s'
=
@discussion_to_resolve
?
'
thread'
:
'thread
s'
at
=
link_to_discussions_to_resolve
(
@merge_request_to_resolve_discussions_of
,
@discussion_to_resolve
)
will stay unresolved. Ask someone with permission to resolve
...
...
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