Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-05-24

# Conflicts:
#	app/mailers/emails/merge_requests.rb
#	app/services/notification_service.rb
#	app/services/todo_service.rb

[ci skip]

app/mailers/emails/merge_requests.rb

@@ -64,6 +64,7 @@ module Emails
       mail_answer_thread(@merge_request, merge_request_thread_options(@merge_request.author_id, recipient_id, reason))
     end
 
+<<<<<<< HEAD
     def add_merge_request_approver_email(recipient_id, merge_request_id, updated_by_user_id, reason = nil)
       setup_merge_request_mail(merge_request_id, recipient_id)
 
@@ -85,6 +86,8 @@ module Emails
       mail_answer_thread(@merge_request, merge_request_thread_options(unapproved_by_user_id, recipient_id, reason))
     end
 
+=======
+>>>>>>> upstream/master
     def resolved_all_discussions_email(recipient_id, merge_request_id, resolved_by_user_id, reason = nil)
       setup_merge_request_mail(merge_request_id, recipient_id)
 

app/models/concerns/resolvable_note.rb

@@ -32,7 +32,7 @@ module ResolvableNote
 
   # Keep this method in sync with the `potentially_resolvable` scope
   def potentially_resolvable?
-    RESOLVABLE_TYPES.include?(self.class.name) && noteable.supports_resolvable_notes?
+    RESOLVABLE_TYPES.include?(self.class.name) && noteable&.supports_resolvable_notes?
   end
 
   # Keep this method in sync with the `resolvable` scope

app/services/notification_service.rb

@@ -525,6 +525,7 @@ class NotificationService
     end
   end
 
+<<<<<<< HEAD
   def approve_mr_email(merge_request, project, current_user)
     recipients = NotificationRecipientService.build_recipients(merge_request, current_user, action: 'approve')
 
@@ -549,6 +550,8 @@ class NotificationService
     end
   end
 
+=======
+>>>>>>> upstream/master
   def mailer
     Notify
   end

app/services/todo_service.rb

@@ -104,6 +104,7 @@ class TodoService
     merge_request.merge_participants.each do |user|
       create_build_failed_todo(merge_request, user)
     end
+<<<<<<< HEAD
   end
 
   # When new approvers are added for a merge request:
@@ -112,6 +113,8 @@ class TodoService
   #
   def add_merge_request_approvers(merge_request, approvers)
     create_approval_required_todos(merge_request, approvers, merge_request.author)
+=======
+>>>>>>> upstream/master
   end
 
   # When a new commit is pushed to a merge request we should:

changelogs/unreleased/jprovazn-fix-resolvable.yml

+---
+title: Fix resolvable check if note's commit could not be found.
+merge_request:
+author:
+type: fixed

spec/models/concerns/resolvable_note_spec.rb

@@ -326,4 +326,12 @@ describe Note, ResolvableNote do
       end
     end
   end
+
+  describe "#potentially_resolvable?" do
+    it 'returns false if noteable could not be found' do
+      allow(subject).to receive(:noteable).and_return(nil)
+
+      expect(subject.potentially_resolvable?).to be_falsey
+    end
+  end
 end