Merge branch 'add-approval-system-note-icons' into 'master'

Add icon for approvals in MR

See merge request !1641

app/helpers/system_note_helper.rb

@@ -16,7 +16,9 @@ module SystemNoteHelper
     'visible' => 'icon_eye',
     'milestone' => 'icon_clock_o',
     'discussion' => 'icon_comment_o',
-    'moved' => 'icon_arrow_circle_o_right'
+    'moved' => 'icon_arrow_circle_o_right',
+    'approved' => 'icon_check',
+    'unapproved' => 'icon_fa_close'
   }.freeze
 
   def icon_for_system_note(note)

app/models/system_note_metadata.rb

@@ -2,7 +2,7 @@ class SystemNoteMetadata < ActiveRecord::Base
   ICON_TYPES = %w[
     commit merge confidential visible label assignee cross_reference
     title time_tracking branch milestone discussion task moved opened closed merged
-    approvals
+    approved unapproved
   ].freeze
 
   validates :note, presence: true

app/services/system_note_service.rb

@@ -488,13 +488,13 @@ module SystemNoteService
   def approve_mr(noteable, user)
     body = "approved this merge request"
 
-    create_note(NoteSummary.new(noteable, noteable.project, user, body, action: 'approvals'))
+    create_note(NoteSummary.new(noteable, noteable.project, user, body, action: 'approved'))
   end
 
   def unapprove_mr(noteable, user)
     body = "unapproved this merge request"
 
-    create_note(NoteSummary.new(noteable, noteable.project, user, body, action: 'approvals'))
+    create_note(NoteSummary.new(noteable, noteable.project, user, body, action: 'unapproved'))
   end
 
   private

app/views/shared/icons/_icon_check.svg

+<svg width="1792" height="1792" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg"><path d="M1671 566q0 40-28 68l-724 724-136 136q-28 28-68 28t-68-28l-136-136-362-362q-28-28-28-68t28-68l136-136q28-28 68-28t68 28l294 295 656-657q28-28 68-28t68 28l136 136q28 28 28 68z"/></svg>

app/views/shared/icons/_icon_fa_close.svg

+<svg width="1792" height="1792" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg"><path d="M1490 1322q0 40-28 68l-136 136q-28 28-68 28t-68-28l-294-294-294 294q-28 28-68 28t-68-28l-136-136q-28-28-28-68t28-68l294-294-294-294q-28-28-28-68t28-68l136-136q28-28 68-28t68 28l294 294 294-294q28-28 68-28t68 28l136 136q28 28 28 68t-28 68l-294 294 294 294q28 28 28 68z"/></svg>

spec/services/system_note_service_spec.rb

@@ -807,7 +807,7 @@ describe SystemNoteService, services: true do
     subject { described_class.approve_mr(noteable, author) }
 
     it_behaves_like 'a system note' do
-      let(:action) { 'approvals' }
+      let(:action) { 'approved' }
     end
 
     context 'when merge request approved' do
@@ -817,6 +817,21 @@ describe SystemNoteService, services: true do
     end
   end
 
+  describe '.unapprove_mr' do
+    let(:noteable)    { create(:merge_request, source_project: project) }
+    subject { described_class.unapprove_mr(noteable, author) }
+
+    it_behaves_like 'a system note' do
+      let(:action) { 'unapproved' }
+    end
+
+    context 'when merge request approved' do
+      it 'sets the note text' do
+        expect(subject.note).to eq "unapproved this merge request"
+      end
+    end
+  end
+
   describe '.change_time_estimate' do
     subject { described_class.change_time_estimate(noteable, project, author) }