Merge branch 'master' into awardables

1 files changed, 11 insertions, 0 deletions

diff --git a/app/services/notes/create_service.rb b/app/services/notes/create_service.rb
index c5be21ba897..da2a774b70d 100644
--- a/app/services/notes/create_service.rb
+++ b/app/services/notes/create_service.rb
@@ -10,6 +10,8 @@ module Notes
                                         execute(note.noteable, note.note)
       end
 
+      return unless valid_project?(note)
+
       if note.save
         # Finish the harder work in the background
         NewNoteWorker.perform_in(2.seconds, note.id, params)
@@ -18,5 +20,14 @@ module Notes
 
       note
     end
+
+    private
+
+    def valid_project?(note)
+      return false unless project
+      return true if note.for_commit?
+
+      note.noteable.try(:project) == project
+    end
   end
 end