summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com>2011-11-28 22:43:20 +0200
committerDmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com>2011-11-28 22:43:20 +0200
commite74ec3c95a68ccdedfcf5a292bee44a4ec043bdb (patch)
tree2cb7d6aa871395e85b02a4ce5274e0c52e6b8105 /app
parentfbba17603fc568654a5ff180fae6b8db6108b37b (diff)
downloadgitlab-ce-e74ec3c95a68ccdedfcf5a292bee44a4ec043bdb.tar.gz
merge requests v1.0
Diffstat (limited to 'app')
-rw-r--r--app/controllers/notes_controller.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb
index ad9531e077c..5bf300566ee 100644
--- a/app/controllers/notes_controller.rb
+++ b/app/controllers/notes_controller.rb
@@ -42,6 +42,8 @@ class NotesController < ApplicationController
Notify.note_commit_email(u, @note).deliver
when "Issue" then
Notify.note_issue_email(u, @note).deliver
+ when "MergeRequest"
+ true # someone should write email notification
when "Snippet"
true
else