diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-06 18:08:49 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-06 18:08:49 +0000 |
| commit | 1ca6880aac4a41fe2ae519a87ebfb90470fad7c5 (patch) | |
| tree | f01c6ed81a6850f23ee1eb64f09044ce2b57aeba /app/views/groups/group_members | |
| parent | 4d922922a97e5ac6a1617aba00642ad7657d2727 (diff) | |
| download | gitlab-ce-1ca6880aac4a41fe2ae519a87ebfb90470fad7c5.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/groups/group_members')
| -rw-r--r-- | app/views/groups/group_members/index.html.haml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/views/groups/group_members/index.html.haml b/app/views/groups/group_members/index.html.haml index ed7b201323a..ad9fd250210 100644 --- a/app/views/groups/group_members/index.html.haml +++ b/app/views/groups/group_members/index.html.haml @@ -69,7 +69,7 @@ = label_tag :sort_by, _('Sort by'), class: form_item_label_css_class = render 'shared/members/sort_dropdown' - if vue_members_list_enabled - .js-group-members-list{ data: { members: members_data_json(@group, @members), **data_attributes } } + .js-group-members-list{ data: { members: members_data_json(@group, @members), member_path: group_group_member_path(id: ':id'), **data_attributes } } - else %ul.content-list.members-list{ data: { qa_selector: 'members_list' } } = render partial: 'shared/members/member', collection: @members, as: :member @@ -95,7 +95,7 @@ = form_tag group_group_members_path(@group), method: :get, class: 'user-search-form', data: { testid: 'user-search-form' } do = render 'shared/members/search_field', name: 'search_invited' - if vue_members_list_enabled - .js-group-invited-members-list{ data: { members: members_data_json(@group, @invited_members), **data_attributes } } + .js-group-invited-members-list{ data: { members: members_data_json(@group, @invited_members), member_path: group_group_member_path(id: ':id'), **data_attributes } } - else %ul.content-list.members-list = render partial: 'shared/members/member', collection: @invited_members, as: :member @@ -107,7 +107,7 @@ = render 'groups/group_members/tab_pane/title' do = html_escape(_('Users requesting access to %{strong_start}%{group_name}%{strong_end}')) % { group_name: @group.name, strong_start: '<strong>'.html_safe, strong_end: '</strong>'.html_safe } - if vue_members_list_enabled - .js-group-access-requests-list{ data: { members: members_data_json(@group, @requesters), **data_attributes } } + .js-group-access-requests-list{ data: { members: members_data_json(@group, @requesters), member_path: group_group_member_path(id: ':id'), **data_attributes } } - else %ul.content-list.members-list = render partial: 'shared/members/member', collection: @requesters, as: :member |