Merge branch 'ce-to-ee-2017-07-26' of https://gitlab.com/gitlab-org/gitlab-ee...

Merge branch 'ce-to-ee-2017-07-26' of https://gitlab.com/gitlab-org/gitlab-ee into ce-to-ee-2017-07-26

app/helpers/system_note_helper.rb

@@ -19,15 +19,11 @@ module SystemNoteHelper
     'discussion' => 'icon_comment_o',
     'moved' => 'icon_arrow_circle_o_right',
     'outdated' => 'icon_edit',
-<<<<<<< HEAD
     'duplicate' => 'icon_clone',
     'approved' => 'icon_check',
     'unapproved' => 'icon_fa_close',
     'relate' => 'icon_anchor',
     'unrelate' => 'icon_anchor_broken'
-=======
-    'duplicate' => 'icon_clone'
->>>>>>> upstream/master
   }.freeze
 
   def icon_for_system_note(note)

app/services/system_note_service.rb

@@ -552,7 +552,6 @@ module SystemNoteService
     create_note(NoteSummary.new(noteable, project, author, body, action: 'moved'))
   end
 
-<<<<<<< HEAD
   #
   # noteable     - Noteable object
   # noteable_ref - Referenced noteable object
@@ -607,8 +606,6 @@ module SystemNoteService
     create_note(NoteSummary.new(noteable, noteable.project, user, body, action: 'unapproved'))
   end
 
-=======
->>>>>>> upstream/master
   # Called when a Noteable has been marked as a duplicate of another Issue
   #
   # noteable        - Noteable object

doc/user/project/quick_actions.md

@@ -41,9 +41,6 @@ do.
 | `/clear_weight` | Clears the issue weight |
 | `/board_move ~column`      | Move issue to column on the board |
 | `/duplicate #issue`        | Closes this issue and marks it as a duplicate of another issue |
-<<<<<<< HEAD
 
 Note: In GitLab EES every issue can have more than one assignee, so commands `/assign`, `/unassign` and `/reassign`
 support multiple assignees.
-=======
->>>>>>> upstream/master

spec/features/issues/user_uses_slash_commands_spec.rb

@@ -119,7 +119,6 @@ feature 'Issues > User uses quick actions', feature: true, js: true do
       end
     end
 
-<<<<<<< HEAD
     describe 'adding a weight from a note' do
       let(:issue) { create(:issue, project: project) }
 
@@ -196,8 +195,6 @@ feature 'Issues > User uses quick actions', feature: true, js: true do
       end
     end
 
-=======
->>>>>>> upstream/master
     describe 'mark issue as duplicate' do
       let(:issue) { create(:issue, project: project) }
       let(:original_issue) { create(:issue, project: project) }

spec/services/quick_actions/interpret_service_spec.rb

@@ -263,7 +263,6 @@ describe QuickActions::InterpretService, services: true do
       end
     end
 
-<<<<<<< HEAD
     shared_examples 'weight command' do
       it 'populates weight: 5 if content contains /weight 5' do
         _, updates = service.execute(content, issuable)
@@ -281,8 +280,6 @@ describe QuickActions::InterpretService, services: true do
       end
     end
 
-=======
->>>>>>> upstream/master
     shared_examples 'duplicate command' do
       it 'fetches issue and populates canonical_issue_id if content contains /duplicate issue_reference' do
         issue_duplicate # populate the issue