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
0
Merge Requests
0
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
Jérome Perrin
gitlab-ce
Commits
f4746d01
Commit
f4746d01
authored
Jul 26, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Variables renames
parent
e786c2b2
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
9 deletions
+9
-9
app/assets/javascripts/diff_notes/components/resolve_all_btn.js.es6
.../javascripts/diff_notes/components/resolve_all_btn.js.es6
+3
-3
app/assets/javascripts/diff_notes/components/resolve_btn.js.es6
...sets/javascripts/diff_notes/components/resolve_btn.js.es6
+2
-2
app/assets/javascripts/diff_notes/components/resolve_count.js.es6
...ts/javascripts/diff_notes/components/resolve_count.js.es6
+3
-3
app/views/projects/merge_requests/_show.html.haml
app/views/projects/merge_requests/_show.html.haml
+1
-1
No files found.
app/assets/javascripts/diff_notes/components/resolve_all_btn.js.es6
View file @
f4746d01
...
@@ -11,15 +11,15 @@
...
@@ -11,15 +11,15 @@
},
},
data: function() {
data: function() {
return {
return {
comment
s: CommentsStore.state,
discussion
s: CommentsStore.state,
loadingObject: CommentsStore.loading,
loadingObject: CommentsStore.loading,
};
};
},
},
computed: {
computed: {
allResolved: function () {
allResolved: function () {
let isResolved = true;
let isResolved = true;
for (const noteId in this.
comment
s[this.discussionId]) {
for (const noteId in this.
discussion
s[this.discussionId]) {
const resolved = this.
comment
s[this.discussionId][noteId].resolved;
const resolved = this.
discussion
s[this.discussionId][noteId].resolved;
if (!resolved) {
if (!resolved) {
isResolved = false;
isResolved = false;
...
...
app/assets/javascripts/diff_notes/components/resolve_btn.js.es6
View file @
f4746d01
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
},
},
data: function () {
data: function () {
return {
return {
comment
s: CommentsStore.state,
discussion
s: CommentsStore.state,
loading: false
loading: false
};
};
},
},
...
...
app/assets/javascripts/diff_notes/components/resolve_count.js.es6
View file @
f4746d01
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
w.ResolveCount = Vue.extend({
w.ResolveCount = Vue.extend({
data: function () {
data: function () {
return {
return {
comment
s: CommentsStore.state,
discussion
s: CommentsStore.state,
loading: false
loading: false
};
};
},
},
...
@@ -29,8 +29,8 @@
...
@@ -29,8 +29,8 @@
return resolvedCount;
return resolvedCount;
},
},
comments
Count: function () {
discussion
Count: function () {
return Object.keys(this.
comment
s).length;
return Object.keys(this.
discussion
s).length;
},
},
allResolved: function () {
allResolved: function () {
return this.resolved === this.commentsCount;
return this.resolved === this.commentsCount;
...
...
app/views/projects/merge_requests/_show.html.haml
View file @
f4746d01
...
@@ -49,7 +49,7 @@
...
@@ -49,7 +49,7 @@
%resolve-count
{
"inline-template"
=>
true
}
%resolve-count
{
"inline-template"
=>
true
}
.line-resolve-all
{
"v-show"
=>
"commentsCount > 0"
}
.line-resolve-all
{
"v-show"
=>
"commentsCount > 0"
}
%span
.line-resolve-text
%span
.line-resolve-text
{{ resolved }}/{{
comments
Count }} discussions resolved
{{ resolved }}/{{
discussion
Count }} discussions resolved
-
if
@commits_count
.
nonzero?
-
if
@commits_count
.
nonzero?
%ul
.merge-request-tabs.nav-links.no-top.no-bottom
%ul
.merge-request-tabs.nav-links.no-top.no-bottom
...
...
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