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
dd6747c2
Commit
dd6747c2
authored
Jun 14, 2019
by
Michel Engelen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
replaced string `discussion` wit `thread` in noteable-discussion component
parent
a3126ecb
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
app/assets/javascripts/notes/components/noteable_discussion.vue
...sets/javascripts/notes/components/noteable_discussion.vue
+6
-6
No files found.
app/assets/javascripts/notes/components/noteable_discussion.vue
View file @
dd6747c2
...
...
@@ -177,22 +177,22 @@ export default {
active
:
isActive
,
}
=
this
.
discussion
;
let
text
=
s__
(
'
MergeRequests|started a
discussion
'
);
let
text
=
s__
(
'
MergeRequests|started a
thread
'
);
if
(
isForCommit
)
{
text
=
s__
(
'
MergeRequests|started a
discussion
on commit %{linkStart}%{commitId}%{linkEnd}
'
,
'
MergeRequests|started a
thread
on commit %{linkStart}%{commitId}%{linkEnd}
'
,
);
}
else
if
(
isDiffDiscussion
&&
commitId
)
{
text
=
isActive
?
s__
(
'
MergeRequests|started a
discussion
on commit %{linkStart}%{commitId}%{linkEnd}
'
)
?
s__
(
'
MergeRequests|started a
thread
on commit %{linkStart}%{commitId}%{linkEnd}
'
)
:
s__
(
'
MergeRequests|started a
discussion
on an outdated change in commit %{linkStart}%{commitId}%{linkEnd}
'
,
'
MergeRequests|started a
thread
on an outdated change in commit %{linkStart}%{commitId}%{linkEnd}
'
,
);
}
else
if
(
isDiffDiscussion
)
{
text
=
isActive
?
s__
(
'
MergeRequests|started a
discussion
on %{linkStart}the diff%{linkEnd}
'
)
?
s__
(
'
MergeRequests|started a
thread
on %{linkStart}the diff%{linkEnd}
'
)
:
s__
(
'
MergeRequests|started a
discussion
on %{linkStart}an old version of the diff%{linkEnd}
'
,
'
MergeRequests|started a
thread
on %{linkStart}an old version of the diff%{linkEnd}
'
,
);
}
...
...
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