summaryrefslogtreecommitdiff
path: root/app/mailers/emails/projects.rb
diff options
context:
space:
mode:
authorJacob Vosmaer <contact@jacobvosmaer.nl>2014-06-18 13:41:12 +0200
committerJacob Vosmaer <contact@jacobvosmaer.nl>2014-06-18 13:41:12 +0200
commit780d868fec936327cbdf688cf6e2571b07d780c9 (patch)
tree415dce6a51954def59111fce1eeeae84d5e3d187 /app/mailers/emails/projects.rb
parentc1ff1fdeff2692bfb0d3210709aa2df1421f0516 (diff)
downloadgitlab-ce-780d868fec936327cbdf688cf6e2571b07d780c9.tar.gz
Revert "Merge branch 'fix-email-threading' into 'master'"
This reverts commit 97fd990ecde387290be269ef7daafa5761f94af6, reversing changes made to f451a697e0c018359e6d8ff3aaba4eb0484c4bee. Conflicts: app/mailers/emails/notes.rb app/mailers/emails/projects.rb
Diffstat (limited to 'app/mailers/emails/projects.rb')
-rw-r--r--app/mailers/emails/projects.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/mailers/emails/projects.rb b/app/mailers/emails/projects.rb
index 64878568ef8..6b13a1d746d 100644
--- a/app/mailers/emails/projects.rb
+++ b/app/mailers/emails/projects.rb
@@ -4,7 +4,7 @@ module Emails
@users_project = UsersProject.find user_project_id
@project = @users_project.project
@target_url = project_url(@project)
- mail(cc: @users_project.user.email,
+ mail(to: @users_project.user.email,
subject: subject("Access to project was granted"))
end
@@ -12,7 +12,7 @@ module Emails
@user = User.find user_id
@project = Project.find project_id
@target_url = project_url(@project)
- mail(cc: @user.email,
+ mail(to: @user.email,
subject: subject("Project was moved"))
end
@@ -32,7 +32,7 @@ module Emails
end
mail(from: sender(author_id),
- cc: recipient,
+ to: recipient,
subject: subject(@subject))
end
end