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
9c4ea1a3
Commit
9c4ea1a3
authored
Jun 12, 2019
by
Michel Engelen
Committed by
Michel Engelen
Jul 02, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
renamed `discussion` to `thread` in popover from reply form button
parent
65f78d0b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
app/assets/javascripts/notes/components/discussion_resolve_with_issue_button.vue
...notes/components/discussion_resolve_with_issue_button.vue
+1
-1
app/views/discussions/_new_issue_for_discussion.html.haml
app/views/discussions/_new_issue_for_discussion.html.haml
+2
-2
No files found.
app/assets/javascripts/notes/components/discussion_resolve_with_issue_button.vue
View file @
9c4ea1a3
...
...
@@ -25,7 +25,7 @@ export default {
<gl-button
v-gl-tooltip
:href=
"url"
:title=
"s__('MergeRequests|Resolve this
discussion
in a new issue')"
:title=
"s__('MergeRequests|Resolve this
thread
in a new issue')"
class=
"new-issue-for-discussion discussion-create-issue-btn"
>
<icon
name=
"issue-new"
/>
...
...
app/views/discussions/_new_issue_for_discussion.html.haml
View file @
9c4ea1a3
...
...
@@ -4,7 +4,7 @@
.btn-group
{
role:
"group"
,
"v-if"
=>
"showButton"
}
=
link_to
custom_icon
(
'icon_mr_issue'
),
new_project_issue_path
(
@project
,
merge_request_to_resolve_discussions_of:
merge_request
.
iid
,
discussion_to_resolve:
discussion
.
id
),
title:
'Resolve this
discussion
in a new issue'
,
aria:
{
label:
'Resolve this
discussion
in a new issue'
},
title:
'Resolve this
thread
in a new issue'
,
aria:
{
label:
'Resolve this
thread
in a new issue'
},
data:
{
container:
'body'
},
class:
'new-issue-for-discussion btn btn-default discussion-create-issue-btn has-tooltip'
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