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
2a346fad
Commit
2a346fad
authored
Jun 25, 2019
by
Michel Engelen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
replaced string `discussion` with `thread`
parent
a32512e6
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
ee/app/assets/javascripts/batch_comments/components/preview_item.vue
...ts/javascripts/batch_comments/components/preview_item.vue
+1
-1
ee/app/assets/javascripts/batch_comments/mixins/resolved_status.js
...sets/javascripts/batch_comments/mixins/resolved_status.js
+4
-4
ee/app/assets/javascripts/batch_comments/stores/modules/batch_comments/actions.js
...s/batch_comments/stores/modules/batch_comments/actions.js
+1
-1
No files found.
ee/app/assets/javascripts/batch_comments/components/preview_item.vue
View file @
2a346fad
...
...
@@ -39,7 +39,7 @@ export default {
return
file
.
file_path
;
}
return
sprintf
(
__
(
"
%{authorsName}'s
discussion
"
),
{
return
sprintf
(
__
(
"
%{authorsName}'s
thread
"
),
{
authorsName
:
this
.
discussion
.
notes
.
find
(
note
=>
!
note
.
system
).
author
.
name
,
});
},
...
...
ee/app/assets/javascripts/batch_comments/mixins/resolved_status.js
View file @
2a346fad
...
...
@@ -36,14 +36,14 @@ export default {
if
(
discussionToBeResolved
)
{
if
(
discussionResolved
)
{
message
=
s__
(
'
MergeRequests|
Discussion
stays resolved
'
);
message
=
s__
(
'
MergeRequests|
Thread
stays resolved
'
);
}
else
{
message
=
s__
(
'
MergeRequests|
Discussion
will be resolved
'
);
message
=
s__
(
'
MergeRequests|
Thread
will be resolved
'
);
}
}
else
if
(
discussionResolved
)
{
message
=
s__
(
'
MergeRequests|
Discussion
will be unresolved
'
);
message
=
s__
(
'
MergeRequests|
Thread
will be unresolved
'
);
}
else
if
(
this
.
$options
.
showStaysResolved
)
{
message
=
s__
(
'
MergeRequests|
Discussion
stays unresolved
'
);
message
=
s__
(
'
MergeRequests|
Thread
stays unresolved
'
);
}
return
message
;
...
...
ee/app/assets/javascripts/batch_comments/stores/modules/batch_comments/actions.js
View file @
2a346fad
...
...
@@ -21,7 +21,7 @@ export const addDraftToDiscussion = ({ commit }, { endpoint, data }) =>
return
res
;
})
.
catch
(()
=>
{
flash
(
__
(
'
An error occurred adding a draft to the
discussion
.
'
));
flash
(
__
(
'
An error occurred adding a draft to the
thread
.
'
));
});
export
const
createNewDraft
=
({
commit
},
{
endpoint
,
data
})
=>
...
...
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