diff options
| author | Phil Hughes <me@iamphill.com> | 2019-05-15 11:18:08 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-05-15 11:18:08 +0000 |
| commit | 373223e0f456ea261ec370a60d89caa9739d6528 (patch) | |
| tree | 7730d20929dc80e2df51a3950ed17d8b508e02b9 /app/helpers | |
| parent | 5750cf3bf7f7d4311116bedd3e2e32908520d0e2 (diff) | |
| parent | fae745c3421efe5793e55e4b29a538277608120c (diff) | |
| download | gitlab-ce-373223e0f456ea261ec370a60d89caa9739d6528.tar.gz | |
Merge branch 'new-proj-member-scb' into 'master'
Resolve CE/EE diffs in new proj member import
See merge request gitlab-org/gitlab-ce!28254
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/projects_helper.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 2c43b1a2067..91d15e0e4ea 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -315,6 +315,10 @@ module ProjectsHelper ) % { default_label: default_label } end + def can_import_members? + Ability.allowed?(current_user, :admin_project_member, @project) + end + private def get_project_nav_tabs(project, current_user) |