diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-07 00:09:19 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-07 00:09:19 +0300 |
commit | 7915c41e4261719719e791602c8235574157164c (patch) | |
tree | 6c1fc8c4ad4e974878c879fcc2c7c8f7d56d0cee /app/views | |
parent | 495c22d1245b6212b21b7379a542df73dfa77206 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views')
-rw-r--r-- | app/views/admin/groups/_form.html.haml | 2 | ||||
-rw-r--r-- | app/views/admin/groups/_group.html.haml | 4 | ||||
-rw-r--r-- | app/views/admin/groups/index.html.haml | 2 | ||||
-rw-r--r-- | app/views/admin/groups/show.html.haml | 2 | ||||
-rw-r--r-- | app/views/layouts/nav/sidebar/_admin.html.haml | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/app/views/admin/groups/_form.html.haml b/app/views/admin/groups/_form.html.haml index dd01ef8a29f..22cf722d117 100644 --- a/app/views/admin/groups/_form.html.haml +++ b/app/views/admin/groups/_form.html.haml @@ -32,7 +32,7 @@ - else .form-actions - = f.submit _('Save changes'), class: "btn btn-success" + = f.submit _('Save changes'), class: "btn btn-success", data: { qa_selector: 'save_changes_button' } = link_to _('Cancel'), admin_group_path(@group), class: "btn btn-cancel" = render_if_exists 'ldap_group_links/ldap_syncrhonizations', group: @group diff --git a/app/views/admin/groups/_group.html.haml b/app/views/admin/groups/_group.html.haml index 855858ff929..5fe8f9b4bbc 100644 --- a/app/views/admin/groups/_group.html.haml +++ b/app/views/admin/groups/_group.html.haml @@ -1,7 +1,7 @@ - group = local_assigns.fetch(:group) - css_class = 'no-description' if group.description.blank? -%li.group-row.py-3{ class: css_class } +%li.group-row.py-3{ class: css_class, data: { qa_selector: 'group_row_content' } } .controls = link_to _('Edit'), admin_group_edit_path(group), id: "edit_#{dom_id(group)}", class: 'btn' = link_to _('Delete'), [:admin, group], data: { confirm: _("Are you sure you want to remove %{group_name}?") % { group_name: group.name } }, method: :delete, class: 'btn btn-remove' @@ -26,7 +26,7 @@ .avatar-container.rect-avatar.s40 = group_icon(group, class: "avatar s40 d-none d-sm-block") .title - = link_to [:admin, group], class: 'group-name' do + = link_to [:admin, group], class: 'group-name', data: { qa_selector: 'group_name_link' } do = group.full_name - if group.description.present? diff --git a/app/views/admin/groups/index.html.haml b/app/views/admin/groups/index.html.haml index 434b6e3a37e..f295e5a06cb 100644 --- a/app/views/admin/groups/index.html.haml +++ b/app/views/admin/groups/index.html.haml @@ -7,7 +7,7 @@ .search-holder - project_name = params[:name].present? ? params[:name] : nil .search-field-holder - = search_field_tag :name, project_name, class: "form-control search-text-input js-search-input", autofocus: true, spellcheck: false, placeholder: 'Search by name' + = search_field_tag :name, project_name, class: "form-control search-text-input js-search-input", autofocus: true, spellcheck: false, placeholder: 'Search by name', data: { qa_selector: 'group_search_field' } = icon("search", class: "search-icon") = render "shared/groups/dropdown", options_hash: admin_groups_sort_options_hash = link_to new_admin_group_path, class: "btn btn-success" do diff --git a/app/views/admin/groups/show.html.haml b/app/views/admin/groups/show.html.haml index 3c542c962ec..ebed558f11b 100644 --- a/app/views/admin/groups/show.html.haml +++ b/app/views/admin/groups/show.html.haml @@ -4,7 +4,7 @@ %h3.page-title = _('Group: %{group_name}') % { group_name: @group.full_name } - = link_to admin_group_edit_path(@group), class: "btn float-right" do + = link_to admin_group_edit_path(@group), class: "btn float-right", data: { qa_selector: 'edit_group_link' } do %i.fa.fa-pencil-square-o = _('Edit') %hr diff --git a/app/views/layouts/nav/sidebar/_admin.html.haml b/app/views/layouts/nav/sidebar/_admin.html.haml index a5f285e4e96..52964dd6739 100644 --- a/app/views/layouts/nav/sidebar/_admin.html.haml +++ b/app/views/layouts/nav/sidebar/_admin.html.haml @@ -28,11 +28,11 @@ %span = _('Projects') = nav_link(controller: :users) do - = link_to admin_users_path, title: _('Users') , data: { qa_selector: 'users_overview_link' } do + = link_to admin_users_path, title: _('Users'), data: { qa_selector: 'users_overview_link' } do %span = _('Users') = nav_link(controller: :groups) do - = link_to admin_groups_path, title: _('Groups') do + = link_to admin_groups_path, title: _('Groups'), data: { qa_selector: 'groups_overview_link' } do %span = _('Groups') = nav_link path: 'jobs#index' do |