summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose Ivan Vargas <jvargas@gitlab.com>2017-01-19 18:11:12 -0600
committerJose Ivan Vargas <jvargas@gitlab.com>2017-04-24 18:17:43 -0500
commit967019f7792175c9fc010069657a7e09cf278575 (patch)
tree7c5966527288016d88e5cf63de12f3e5ba733605
parent080aac050d852c332181a0e3fed7821d52d16c1a (diff)
downloadgitlab-ce-967019f7792175c9fc010069657a7e09cf278575.tar.gz
Added a description for non project masters or owners for the members settings page
Truncated the project name if it exceeds 18 characters
-rw-r--r--app/views/projects/project_members/_index.html.haml6
1 files changed, 6 insertions, 0 deletions
diff --git a/app/views/projects/project_members/_index.html.haml b/app/views/projects/project_members/_index.html.haml
index ab0771b5751..f83521052ed 100644
--- a/app/views/projects/project_members/_index.html.haml
+++ b/app/views/projects/project_members/_index.html.haml
@@ -6,6 +6,12 @@
%p
Add a new member to
%strong= @project.name
+ - else
+ %p
+ Members can be added by project
+ %i Masters
+ or
+ %i Owners
.col-lg-9
.light.prepend-top-default
- if can?(current_user, :admin_project_member, @project)