diff --git a/app/assets/javascripts/line_comments/application.js.coffee b/app/assets/javascripts/line_comments/application.js.coffee
index 396416efb7864f252b1f3bbf67562e7f84d9f533..3c0957ce4588aea9186a1a8ad22986b32717f217 100644
--- a/app/assets/javascripts/line_comments/application.js.coffee
+++ b/app/assets/javascripts/line_comments/application.js.coffee
@@ -1,6 +1,10 @@
 #= require vue
+#= require_directory ./stores
 #= require_directory ./components
 
 $ ->
   new Vue
     el: '#notes'
+
+  new Vue
+    el: '#resolve-all-app'
diff --git a/app/assets/javascripts/line_comments/components/line_btn.js.coffee b/app/assets/javascripts/line_comments/components/line_btn.js.coffee
deleted file mode 100644
index 3abcd41df1eb34a2d86e2c68c814b9223a066e65..0000000000000000000000000000000000000000
--- a/app/assets/javascripts/line_comments/components/line_btn.js.coffee
+++ /dev/null
@@ -1,19 +0,0 @@
-LineBtn = Vue.extend
-  props:
-    noteId: Number
-    resolved: Boolean
-  computed:
-    buttonText: ->
-      if this.resolved then "Mark as un-resolved" else "Mark as resolved"
-  methods:
-    updateTooltip: ->
-      $(this.$el)
-        .tooltip('hide')
-        .tooltip('fixTitle')
-    resolve: ->
-      this.$set('resolved', !this.resolved)
-      this.$nextTick this.updateTooltip
-  compiled: ->
-    $(this.$el).tooltip()
-
-Vue.component 'line-btn', LineBtn
diff --git a/app/assets/javascripts/line_comments/components/resolve_all.js.coffee b/app/assets/javascripts/line_comments/components/resolve_all.js.coffee
new file mode 100644
index 0000000000000000000000000000000000000000..0cc19a7a3990442de0e613bde6ddf9c65e31843b
--- /dev/null
+++ b/app/assets/javascripts/line_comments/components/resolve_all.js.coffee
@@ -0,0 +1,19 @@
+ResolveAll = Vue.extend
+  data: ->
+    { comments: CommentsStore.state }
+  computed:
+    resolved: ->
+      resolvedCount = 0
+      for noteId, resolved of this.comments
+        resolvedCount++ if resolved
+      resolvedCount
+    commentsCount: ->
+      Object.keys(this.comments).length
+    buttonText: ->
+      if this.resolved is this.commentsCount then 'Un-resolve all' else 'Resolve all'
+  methods:
+    updateAll: ->
+      resolveAll = !(this.resolved is this.commentsCount)
+      CommentsStore.updateAll(resolveAll)
+
+Vue.component 'resolve-all', ResolveAll
diff --git a/app/assets/javascripts/line_comments/components/resolve_btn.js.coffee b/app/assets/javascripts/line_comments/components/resolve_btn.js.coffee
new file mode 100644
index 0000000000000000000000000000000000000000..7470dc517febc7b8927efe03ca5c8d4a244b6af4
--- /dev/null
+++ b/app/assets/javascripts/line_comments/components/resolve_btn.js.coffee
@@ -0,0 +1,24 @@
+ResolveBtn = Vue.extend
+  props:
+    noteId: Number
+    resolved: Boolean
+  data: -> comments: CommentsStore.state
+  computed:
+    buttonText: ->
+      if this.comments[this.noteId] then "Mark as un-resolved" else "Mark as resolved"
+    isResolved: -> this.comments[this.noteId]
+  methods:
+    updateTooltip: ->
+      $(this.$el)
+        .tooltip('hide')
+        .tooltip('fixTitle')
+    resolve: ->
+      CommentsStore.update(this.noteId, !this.comments[this.noteId])
+
+      this.$nextTick this.updateTooltip
+  compiled: ->
+    $(this.$el).tooltip()
+  created: ->
+    CommentsStore.create(this.noteId, this.resolved)
+
+Vue.component 'resolve-btn', ResolveBtn
diff --git a/app/assets/javascripts/line_comments/stores/comments.js.coffee b/app/assets/javascripts/line_comments/stores/comments.js.coffee
new file mode 100644
index 0000000000000000000000000000000000000000..c002dc0c4d658a7d6a6f868376247e6f7a3faf8d
--- /dev/null
+++ b/app/assets/javascripts/line_comments/stores/comments.js.coffee
@@ -0,0 +1,9 @@
+@CommentsStore =
+  state: {}
+  create: (id, resolved) ->
+    Vue.set(this.state, id, resolved)
+  update: (id, resolved) ->
+    this.state[id] = resolved
+  updateAll: (state) ->
+    for id,resolved of this.state
+      this.update(id, state) if resolved isnt state
diff --git a/app/assets/stylesheets/behaviors.scss b/app/assets/stylesheets/behaviors.scss
index 542a53f0377f924f06dbc104f99251f0d56797e9..c629229e4d93ee6439fd7c6520c49d2bebda1ddb 100644
--- a/app/assets/stylesheets/behaviors.scss
+++ b/app/assets/stylesheets/behaviors.scss
@@ -20,3 +20,7 @@
     .turn-off { display: block; }
   }
 }
+
+[v-cloak="true"] {
+  display: none;
+}
diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml
index f7f7182b2a0c11828a418e3aaedbd992c1737b26..de6d3d5293605f687b68f985569ce26e593fbea3 100644
--- a/app/views/projects/merge_requests/_show.html.haml
+++ b/app/views/projects/merge_requests/_show.html.haml
@@ -44,7 +44,15 @@
         = succeed '.' do
           = link_to "command line", "#modal_merge_info", class: "how_to_merge_link vlink", title: "How To Merge", "data-toggle" => "modal"
 
-    - if @commits_count.nonzero?
+    #resolve-all-app{ "v-cloak" => true }
+      %resolve-all{ "inline-template" => true }
+        .line-resolve-all{ "v-show" => "commentsCount > 0" }
+          %button.btn.btn-gray{ type: "button", "aria-label" => "Resolve all", "v-on:click" => "updateAll" }
+            {{ buttonText }}
+          %span.line-resolve-text
+            {{ resolved }}/{{ commentsCount }} comments resolved
+
+    - if @commits.nonzero?
       %ul.merge-request-tabs.nav-links.no-top.no-bottom
         %li.notes-tab
           = link_to namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: {target: 'div#notes', action: 'notes', toggle: 'tab'} do
diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml
index 9b1eb8545e5cc256a913a4b9c42d849d11b41a34..beaae53992d99bd891560fefe24cbf8c090135bd 100644
--- a/app/views/projects/notes/_note.html.haml
+++ b/app/views/projects/notes/_note.html.haml
@@ -21,8 +21,8 @@
           - if access and not note.system
             %span.note-role.hidden-xs= access
           - unless note.system
-            %line-btn{ ":note-id" => note.id, ":resolved" => "false", "inline-template" => true }
-              %button.note-action-button.line-resolve-btn{ type: "button", "v-bind:class" => "{ 'is-active': resolved }", "v-bind:aria-label" => "buttonText", "v-on:click" => "resolve", "v-bind:title" => "buttonText" }
+            %resolve-btn{ ":note-id" => note.id, ":resolved" => "false", "inline-template" => true }
+              %button.note-action-button.line-resolve-btn{ type: "button", "v-bind:class" => "{ 'is-active': isResolved }", "v-bind:aria-label" => "buttonText", "v-on:click" => "resolve", "v-bind:title" => "buttonText" }
                 = icon("check")
           - if current_user and not note.system
             = link_to '#', title: 'Award Emoji', class: 'note-action-button note-emoji-button js-add-award js-note-emoji', data: { position: 'right' } do