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
83a977f0
Commit
83a977f0
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 discussion (thread) counter
parent
897e5eed
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
app/assets/javascripts/notes/components/discussion_counter.vue
...ssets/javascripts/notes/components/discussion_counter.vue
+3
-3
No files found.
app/assets/javascripts/notes/components/discussion_counter.vue
View file @
83a977f0
...
@@ -61,7 +61,7 @@ export default {
...
@@ -61,7 +61,7 @@ export default {
</span>
</span>
<span
class=
"line-resolve-text"
>
<span
class=
"line-resolve-text"
>
{{
resolvedDiscussionsCount
}}
/
{{
resolvableDiscussionsCount
}}
{{
resolvedDiscussionsCount
}}
/
{{
resolvableDiscussionsCount
}}
{{
n__
(
'
discussion resolved
'
,
'
discussion
s resolved
'
,
resolvableDiscussionsCount
)
}}
{{
n__
(
'
thread resolved
'
,
'
thread
s resolved
'
,
resolvableDiscussionsCount
)
}}
</span>
</span>
</div>
</div>
<div
<div
...
@@ -72,7 +72,7 @@ export default {
...
@@ -72,7 +72,7 @@ export default {
<a
<a
v-gl-tooltip
v-gl-tooltip
:href=
"resolveAllDiscussionsIssuePath"
:href=
"resolveAllDiscussionsIssuePath"
:title=
"s__('Resolve all
discussion
s in new issue')"
:title=
"s__('Resolve all
thread
s in new issue')"
class=
"new-issue-for-discussion btn btn-default discussion-create-issue-btn"
class=
"new-issue-for-discussion btn btn-default discussion-create-issue-btn"
>
>
<icon
name=
"issue-new"
/>
<icon
name=
"issue-new"
/>
...
@@ -81,7 +81,7 @@ export default {
...
@@ -81,7 +81,7 @@ export default {
<div
v-if=
"isLoggedIn && !allResolved"
class=
"btn-group btn-group-sm"
role=
"group"
>
<div
v-if=
"isLoggedIn && !allResolved"
class=
"btn-group btn-group-sm"
role=
"group"
>
<button
<button
v-gl-tooltip
v-gl-tooltip
title=
"Jump to first unresolved
discussion
"
title=
"Jump to first unresolved
thread
"
class=
"btn btn-default discussion-next-btn"
class=
"btn btn-default discussion-next-btn"
@
click=
"jumpToFirstUnresolvedDiscussion"
@
click=
"jumpToFirstUnresolvedDiscussion"
>
>
...
...
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