Variables renames

app/assets/javascripts/diff_notes/components/resolve_all_btn.js.es6

@@ -11,15 +11,15 @@
     },
     data: function() {
       return {
-        comments: CommentsStore.state,
+        discussions: CommentsStore.state,
         loadingObject: CommentsStore.loading,
       };
     },
     computed: {
       allResolved: function () {
         let isResolved = true;
-        for (const noteId in this.comments[this.discussionId]) {
-          const resolved = this.comments[this.discussionId][noteId].resolved;
+        for (const noteId in this.discussions[this.discussionId]) {
+          const resolved = this.discussions[this.discussionId][noteId].resolved;
 
           if (!resolved) {
             isResolved = false;

app/assets/javascripts/diff_notes/components/resolve_btn.js.es6

@@ -14,7 +14,7 @@
     },
     data: function () {
       return {
-        comments: CommentsStore.state,
+        discussions: CommentsStore.state,
         loading: false
       };
     },
@@ -37,7 +37,7 @@
       },
       resolve: function () {
         if (!this.canResolve) return;
-        
+
         let promise;
         this.loading = true;
 

app/assets/javascripts/diff_notes/components/resolve_count.js.es6

@@ -2,7 +2,7 @@
   w.ResolveCount = Vue.extend({
     data: function () {
       return {
-        comments: CommentsStore.state,
+        discussions: CommentsStore.state,
         loading: false
       };
     },
@@ -29,8 +29,8 @@
 
         return resolvedCount;
       },
-      commentsCount: function () {
-        return Object.keys(this.comments).length;
+      discussionCount: function () {
+        return Object.keys(this.discussions).length;
       },
       allResolved: function () {
         return this.resolved === this.commentsCount;

app/views/projects/merge_requests/_show.html.haml

@@ -49,7 +49,7 @@
         %resolve-count{ "inline-template" => true }
           .line-resolve-all{ "v-show" => "commentsCount > 0" }
             %span.line-resolve-text
-              {{ resolved }}/{{ commentsCount }} discussions resolved
+              {{ resolved }}/{{ discussionCount }} discussions resolved
 
     - if @commits_count.nonzero?
       %ul.merge-request-tabs.nav-links.no-top.no-bottom