Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-09-15 11:57:02 +0400
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-09-15 11:57:02 +0400
commitbdbadebe3e6e25180d8c1465dde4573fa0ecc389 (patch)
tree64530175e13127cbc68cc9d6c24adfb6c7e56912 /app/mailers/emails
parent1aa48174db63871bb10b53e49c86222a4d9b7c6d (diff)
Fix adminarea and emails for new membership logic
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/mailers/emails')
-rw-r--r--app/mailers/emails/groups.rb2
-rw-r--r--app/mailers/emails/projects.rb8
2 files changed, 5 insertions, 5 deletions
diff --git a/app/mailers/emails/groups.rb b/app/mailers/emails/groups.rb
index 3f7c1d27350..8c09389985e 100644
--- a/app/mailers/emails/groups.rb
+++ b/app/mailers/emails/groups.rb
@@ -1,6 +1,6 @@
module Emails
module Groups
- def access_level_granted_email(user_group_id)
+ def group_access_granted_email(user_group_id)
@membership = GroupMember.find(user_group_id)
@group = @membership.group
@target_url = group_url(@group)
diff --git a/app/mailers/emails/projects.rb b/app/mailers/emails/projects.rb
index 152d5aa9959..d6edfd7059f 100644
--- a/app/mailers/emails/projects.rb
+++ b/app/mailers/emails/projects.rb
@@ -1,10 +1,10 @@
module Emails
module Projects
- def access_level_granted_email(user_project_id)
- @users_project = ProjectMember.find user_project_id
- @project = @users_project.project
+ def project_access_granted_email(user_project_id)
+ @project_member = ProjectMember.find user_project_id
+ @project = @project_member.project
@target_url = project_url(@project)
- mail(to: @users_project.user.email,
+ mail(to: @project_member.user.email,
subject: subject("Access to project was granted"))
end