summaryrefslogtreecommitdiff
path: root/app/views/notify
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-09-15 10:57:02 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-09-15 10:57:02 +0300
commitbdbadebe3e6e25180d8c1465dde4573fa0ecc389 (patch)
tree64530175e13127cbc68cc9d6c24adfb6c7e56912 /app/views/notify
parent1aa48174db63871bb10b53e49c86222a4d9b7c6d (diff)
downloadgitlab-ce-bdbadebe3e6e25180d8c1465dde4573fa0ecc389.tar.gz
Fix adminarea and emails for new membership logic
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/views/notify')
-rw-r--r--app/views/notify/project_access_granted_email.html.haml2
-rw-r--r--app/views/notify/project_access_granted_email.text.erb2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/notify/project_access_granted_email.html.haml b/app/views/notify/project_access_granted_email.html.haml
index ce34f825358..4596205f39b 100644
--- a/app/views/notify/project_access_granted_email.html.haml
+++ b/app/views/notify/project_access_granted_email.html.haml
@@ -1,5 +1,5 @@
%p
- = "You have been granted #{@users_project.human_access} access to project"
+ = "You have been granted #{@project_member.human_access} access to project"
%p
= link_to project_url(@project) do
= @project.name_with_namespace
diff --git a/app/views/notify/project_access_granted_email.text.erb b/app/views/notify/project_access_granted_email.text.erb
index 66c57def375..de24feb802f 100644
--- a/app/views/notify/project_access_granted_email.text.erb
+++ b/app/views/notify/project_access_granted_email.text.erb
@@ -1,4 +1,4 @@
-You have been granted <%= @users_project.human_access %> access to project <%= @project.name_with_namespace %>
+You have been granted <%= @project_member.human_access %> access to project <%= @project.name_with_namespace %>
<%= url_for(project_url(@project)) %>