summaryrefslogtreecommitdiff
path: root/app/helpers/projects_helper.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-04-10 15:14:14 +0200
committerDouwe Maan <douwe@gitlab.com>2015-04-14 12:07:33 +0200
commit2a1d4255da396d37579e25dd88d5a9ea76116c22 (patch)
tree13294a9674a141172fc12712f17d63e5bc27836f /app/helpers/projects_helper.rb
parentcee98f22478b5ec27f91da04fe564a9760f79a38 (diff)
downloadgitlab-ce-2a1d4255da396d37579e25dd88d5a9ea76116c22.tar.gz
Correctly render invite members without user.
Diffstat (limited to 'app/helpers/projects_helper.rb')
-rw-r--r--app/helpers/projects_helper.rb8
1 files changed, 6 insertions, 2 deletions
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index ebbd2bfd77d..06e5d3b7383 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -1,6 +1,10 @@
module ProjectsHelper
- def remove_from_project_team_message(project, user)
- "You are going to remove #{user.name} from #{project.name} project team. Are you sure?"
+ def remove_from_project_team_message(project, member)
+ if member.user
+ "You are going to remove #{member.user.name} from #{project.name} project team. Are you sure?"
+ else
+ "You are going to cancel invitation for #{member.invite_email} to join #{project.name} project team. Are you sure?"
+ end
end
def link_to_project(project)