diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-10-11 08:40:59 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-10-11 08:40:59 +0000 |
| commit | f5c8923ac29cb0b30442b609d8395ec9caa94d8e (patch) | |
| tree | ae5bde57b0b7d3ef514dc9d2f0947af2376f927b /app | |
| parent | ee6d9e2843d1f4ff5ad35cd1922e839f82971dbd (diff) | |
| parent | 5944ff572cfb220edf9e3730a448f7142d944959 (diff) | |
| download | gitlab-ce-f5c8923ac29cb0b30442b609d8395ec9caa94d8e.tar.gz | |
Merge branch 'ml-qa-add-members' into 'master'
QA: Add test of adding a member to a project
See merge request gitlab-org/gitlab-ce!21753
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/layouts/nav/sidebar/_project.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/project_members/_new_project_member.html.haml | 4 | ||||
| -rw-r--r-- | app/views/projects/project_members/_team.html.haml | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/app/views/layouts/nav/sidebar/_project.html.haml b/app/views/layouts/nav/sidebar/_project.html.haml index 48025f9bd20..3625224fbcd 100644 --- a/app/views/layouts/nav/sidebar/_project.html.haml +++ b/app/views/layouts/nav/sidebar/_project.html.haml @@ -309,7 +309,7 @@ %span = _('General') = nav_link(controller: :project_members) do - = link_to project_project_members_path(@project), title: _('Members') do + = link_to project_project_members_path(@project), title: _('Members'), class: 'qa-link-members-settings' do %span = _('Members') - if can_edit diff --git a/app/views/projects/project_members/_new_project_member.html.haml b/app/views/projects/project_members/_new_project_member.html.haml index 517fd249f6e..5e21442bb60 100644 --- a/app/views/projects/project_members/_new_project_member.html.haml +++ b/app/views/projects/project_members/_new_project_member.html.haml @@ -3,7 +3,7 @@ = form_for @project_member, as: :project_member, url: project_project_members_path(@project), html: { class: 'users-project-form' } do |f| .form-group = label_tag :user_ids, "Select members to invite", class: "label-bold" - = users_select_tag(:user_ids, multiple: true, class: "input-clamp", scope: :all, email_user: true, placeholder: "Search for members to update or invite") + = users_select_tag(:user_ids, multiple: true, class: "input-clamp qa-member-select-input", scope: :all, email_user: true, placeholder: "Search for members to update or invite") .form-group = label_tag :access_level, "Choose a role permission", class: "label-bold" .select-wrapper @@ -17,5 +17,5 @@ = label_tag :expires_at, 'Access expiration date', class: 'label-bold' = text_field_tag :expires_at, nil, class: 'form-control js-access-expiration-date', placeholder: 'Expiration date' %i.clear-icon.js-clear-input - = f.submit "Add to project", class: "btn btn-success" + = f.submit "Add to project", class: "btn btn-success qa-add-member-button" = link_to "Import", import_project_project_members_path(@project), class: "btn btn-default", title: "Import members from another project" diff --git a/app/views/projects/project_members/_team.html.haml b/app/views/projects/project_members/_team.html.haml index 0c5a187f208..9682f8ac922 100644 --- a/app/views/projects/project_members/_team.html.haml +++ b/app/views/projects/project_members/_team.html.haml @@ -14,5 +14,5 @@ %button.member-search-btn{ type: "submit", "aria-label" => "Submit search" } = icon("search") = render 'shared/members/sort_dropdown' - %ul.content-list.members-list + %ul.content-list.members-list.qa-members-list = render partial: 'shared/members/member', collection: members, as: :member |