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
8c9b1995
Commit
8c9b1995
authored
Aug 10, 2020
by
Matej Latin
Committed by
Natalia Tepluhina
Aug 10, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace the "Resolve discussion with a new issue" GlDeprecatedButton
parent
71dd8e65
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
10 deletions
+7
-10
app/assets/javascripts/notes/components/discussion_resolve_with_issue_button.vue
...notes/components/discussion_resolve_with_issue_button.vue
+5
-8
spec/frontend/notes/components/discussion_resolve_with_issue_button_spec.js
...s/components/discussion_resolve_with_issue_button_spec.js
+2
-2
No files found.
app/assets/javascripts/notes/components/discussion_resolve_with_issue_button.vue
View file @
8c9b1995
<
script
>
import
{
GlTooltipDirective
,
GlDeprecatedButton
}
from
'
@gitlab/ui
'
;
import
Icon
from
'
~/vue_shared/components/icon.vue
'
;
import
{
GlTooltipDirective
,
GlButton
}
from
'
@gitlab/ui
'
;
export
default
{
name
:
'
ResolveWithIssueButton
'
,
components
:
{
Icon
,
GlDeprecatedButton
,
GlButton
,
},
directives
:
{
GlTooltip
:
GlTooltipDirective
,
...
...
@@ -22,13 +20,12 @@ export default {
<
template
>
<div
class=
"btn-group"
role=
"group"
>
<gl-
deprecated-
button
<gl-button
v-gl-tooltip
:href=
"url"
:title=
"s__('MergeRequests|Resolve this thread in a new issue')"
class=
"new-issue-for-discussion discussion-create-issue-btn"
>
<icon
name=
"issue-new"
/>
</gl-deprecated-button>
icon=
"issue-new"
/>
</div>
</
template
>
spec/frontend/notes/components/discussion_resolve_with_issue_button_spec.js
View file @
8c9b1995
import
{
Gl
Deprecated
Button
}
from
'
@gitlab/ui
'
;
import
{
GlButton
}
from
'
@gitlab/ui
'
;
import
{
shallowMount
,
createLocalVue
}
from
'
@vue/test-utils
'
;
import
{
TEST_HOST
}
from
'
spec/test_constants
'
;
import
ResolveWithIssueButton
from
'
~/notes/components/discussion_resolve_with_issue_button.vue
'
;
...
...
@@ -23,7 +23,7 @@ describe('ResolveWithIssueButton', () => {
});
it
(
'
it should have a link with the provided link property as href
'
,
()
=>
{
const
button
=
wrapper
.
find
(
Gl
Deprecated
Button
);
const
button
=
wrapper
.
find
(
GlButton
);
expect
(
button
.
attributes
().
href
).
toBe
(
url
);
});
...
...
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