diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-08 09:14:50 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-08 09:14:50 +0300 |
commit | 8986fe34837f7af1df90482c049a1578610cdb94 (patch) | |
tree | b9ae690ef6d6c950097a1430a2d1cd72df3547ba /app/views/projects/project_members | |
parent | 008b36c66e51cb635732bdbcb7f19ae81ea35beb (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects/project_members')
-rw-r--r-- | app/views/projects/project_members/index.html.haml | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/app/views/projects/project_members/index.html.haml b/app/views/projects/project_members/index.html.haml index 2ec3eeaca7f..f97b9a2b02f 100644 --- a/app/views/projects/project_members/index.html.haml +++ b/app/views/projects/project_members/index.html.haml @@ -39,47 +39,6 @@ %p = html_escape(_("Members can be added by project %{i_open}Maintainers%{i_close} or %{i_open}Owners%{i_close}")) % { i_open: '<i>'.html_safe, i_close: '</i>'.html_safe } - - if Feature.disabled?(:invite_members_group_modal, @project.group, default_enabled: :yaml) && can?(current_user, :admin_project_member, @project) && project_can_be_shared? - - if !membership_locked? && @project.allowed_to_share_with_group? - %ul.nav-links.nav.nav-tabs.gitlab-tabs{ role: 'tablist' } - %li.nav-tab{ role: 'presentation' } - %a.nav-link.active{ href: '#invite-member-pane', id: 'invite-member-tab', data: { toggle: 'tab' }, role: 'tab' }= _("Invite member") - %li.nav-tab{ role: 'presentation', class: ('active' if membership_locked?) } - %a.nav-link{ href: '#invite-group-pane', id: 'invite-group-tab', data: { toggle: 'tab', qa_selector: 'invite_group_tab' }, role: 'tab' }= _("Invite group") - - .tab-content.gitlab-tab-content - .tab-pane.active{ id: 'invite-member-pane', role: 'tabpanel' } - = render 'shared/members/invite_member', - submit_url: project_project_members_path(@project), - access_levels: ProjectMember.access_level_roles, - default_access_level: @project_member.access_level, - can_import_members?: can_admin_project_member?(@project), - import_path: import_project_project_members_path(@project) - .tab-pane{ id: 'invite-group-pane', role: 'tabpanel', class: ('active' if membership_locked?) } - = render 'shared/members/invite_group', - submit_url: project_group_links_path(@project), - access_levels: ProjectGroupLink.access_options, - default_access_level: ProjectGroupLink.default_access, - group_link_field: 'link_group_id', - group_access_field: 'link_group_access', - groups_select_tag_data: { min_access_level: Gitlab::Access::GUEST, skip_groups: @skip_groups } - - elsif !membership_locked? - .invite-member - = render 'shared/members/invite_member', - submit_url: project_project_members_path(@project), - access_levels: ProjectMember.access_level_roles, - default_access_level: @project_member.access_level, - can_import_members?: can_admin_project_member?(@project), - import_path: import_project_project_members_path(@project) - - elsif @project.allowed_to_share_with_group? - .invite-group - = render 'shared/members/invite_group', - access_levels: ProjectGroupLink.access_options, - default_access_level: ProjectGroupLink.default_access, - submit_url: project_group_links_path(@project), - group_link_field: 'link_group_id', - group_access_field: 'link_group_access', - groups_select_tag_data: { min_access_level: Gitlab::Access::GUEST, skip_groups: @skip_groups } .js-project-members-list-app{ data: { members_data: project_members_app_data_json(@project, members: @project_members, group_links: @group_links, |