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
4493e471
Commit
4493e471
authored
Feb 18, 2020
by
Philip Jonas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed dormant items
parent
c87e22b2
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
80 deletions
+1
-80
app/assets/javascripts/diff_notes/components/resolve_discussion_btn.js
...vascripts/diff_notes/components/resolve_discussion_btn.js
+0
-70
app/assets/javascripts/diff_notes/diff_notes_bundle.js
app/assets/javascripts/diff_notes/diff_notes_bundle.js
+1
-2
app/views/discussions/_resolve_all.html.haml
app/views/discussions/_resolve_all.html.haml
+0
-8
No files found.
app/assets/javascripts/diff_notes/components/resolve_discussion_btn.js
deleted
100644 → 0
View file @
c87e22b2
/* eslint-disable no-else-return */
/* global CommentsStore */
/* global ResolveService */
import
Vue
from
'
vue
'
;
import
{
__
}
from
'
~/locale
'
;
const
ResolveDiscussionBtn
=
Vue
.
extend
({
props
:
{
discussionId
:
{
type
:
String
,
required
:
true
,
},
mergeRequestId
:
{
type
:
Number
,
required
:
true
,
},
canResolve
:
{
type
:
Boolean
,
required
:
true
,
},
},
data
()
{
return
{
discussion
:
{},
};
},
computed
:
{
showButton
()
{
if
(
this
.
discussion
)
{
return
this
.
discussion
.
isResolvable
();
}
else
{
return
false
;
}
},
isDiscussionResolved
()
{
if
(
this
.
discussion
)
{
return
this
.
discussion
.
isResolved
();
}
else
{
return
false
;
}
},
buttonText
()
{
if
(
this
.
isDiscussionResolved
)
{
return
__
(
'
Unresolve discussion
'
);
}
else
{
return
__
(
'
Resolve discussion
'
);
}
},
loading
()
{
if
(
this
.
discussion
)
{
return
this
.
discussion
.
loading
;
}
else
{
return
false
;
}
},
},
created
()
{
CommentsStore
.
createDiscussion
(
this
.
discussionId
,
this
.
canResolve
);
this
.
discussion
=
CommentsStore
.
state
[
this
.
discussionId
];
},
methods
:
{
resolve
()
{
ResolveService
.
toggleResolveForDiscussion
(
this
.
mergeRequestId
,
this
.
discussionId
);
},
},
});
Vue
.
component
(
'
resolve-discussion-btn
'
,
ResolveDiscussionBtn
);
app/assets/javascripts/diff_notes/diff_notes_bundle.js
View file @
4493e471
...
...
@@ -11,7 +11,6 @@ import './components/comment_resolve_btn';
import
'
./components/jump_to_discussion
'
;
import
'
./components/resolve_btn
'
;
import
'
./components/resolve_count
'
;
import
'
./components/resolve_discussion_btn
'
;
import
'
./components/diff_note_avatars
'
;
import
'
./components/new_issue_for_discussion
'
;
...
...
@@ -20,7 +19,7 @@ export default () => {
document
.
querySelector
(
'
.merge-request
'
)
||
document
.
querySelector
(
'
.commit-box
'
);
const
{
projectPath
}
=
projectPathHolder
.
dataset
;
const
COMPONENT_SELECTOR
=
'
resolve-btn,
resolve-discussion-btn,
jump-to-discussion, comment-and-resolve-btn, new-issue-for-discussion-btn
'
;
'
resolve-btn, jump-to-discussion, comment-and-resolve-btn, new-issue-for-discussion-btn
'
;
window
.
gl
=
window
.
gl
||
{};
window
.
gl
.
diffNoteApps
=
{};
...
...
app/views/discussions/_resolve_all.html.haml
deleted
100644 → 0
View file @
c87e22b2
%resolve-discussion-btn
{
":discussion-id"
=>
"'#{discussion.id}'"
,
":merge-request-id"
=>
discussion
.
noteable
.
iid
,
":can-resolve"
=>
discussion
.
can_resolve?
(
current_user
),
"inline-template"
=>
true
}
.btn-group
{
role:
"group"
,
"v-if"
=>
"showButton"
}
%button
.btn.btn-default
{
type:
"button"
,
"@click"
=>
"resolve"
,
":disabled"
=>
"loading"
,
"v-cloak"
=>
"true"
}
=
icon
(
"spinner spin"
,
"v-show"
=>
"loading"
)
{{ buttonText }}
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