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
897e5eed
Commit
897e5eed
authored
Jun 12, 2019
by
Michel Engelen
Committed by
Michel Engelen
Jul 02, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
changed string `discussion` to `thread` in reply form
parent
28d4a065
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
app/assets/javascripts/notes/mixins/resolvable.js
app/assets/javascripts/notes/mixins/resolvable.js
+3
-3
No files found.
app/assets/javascripts/notes/mixins/resolvable.js
View file @
897e5eed
...
...
@@ -20,13 +20,13 @@ export default {
resolveButtonTitle
()
{
if
(
this
.
updatedNoteBody
)
{
if
(
this
.
discussionResolved
)
{
return
__
(
'
Comment & unresolve
discussion
'
);
return
__
(
'
Comment & unresolve
thread
'
);
}
return
__
(
'
Comment & resolve
discussion
'
);
return
__
(
'
Comment & resolve
thread
'
);
}
return
this
.
discussionResolved
?
__
(
'
Unresolve
discussion
'
)
:
__
(
'
Resolve discussion
'
);
return
this
.
discussionResolved
?
__
(
'
Unresolve
thread
'
)
:
__
(
'
Resolve thread
'
);
},
},
methods
:
{
...
...
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