diff options
| author | ievgenChernikov <ichernikov@zendesk.com> | 2018-11-30 20:29:40 +0000 |
|---|---|---|
| committer | ievgenChernikov <ichernikov@zendesk.com> | 2018-12-10 04:13:04 +0000 |
| commit | ba5e5f8ab052989e8b109cbf2fe9e6f2d960bc0c (patch) | |
| tree | 18b9372bf0078fbf61c44e6cb384316501493b36 /app | |
| parent | c8fa8da2e8814f2e0c28484c3974d678eaf9e043 (diff) | |
| download | gitlab-ce-ba5e5f8ab052989e8b109cbf2fe9e6f2d960bc0c.tar.gz | |
Extended MR spec to set assigneeichernikov-add-assignee-to-mr
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/shared/issuable/_sidebar.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/issuable/form/_metadata_merge_request_assignee.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml index 5295e656ab0..9eecfa39390 100644 --- a/app/views/shared/issuable/_sidebar.html.haml +++ b/app/views/shared/issuable/_sidebar.html.haml @@ -16,7 +16,7 @@ - if current_user .block.todo.hide-expanded = render "shared/issuable/sidebar_todo", todo: todo, issuable: issuable, is_collapsed: true - .block.assignee + .block.assignee.qa-assignee-block = render "shared/issuable/sidebar_assignees", issuable: issuable, can_edit_issuable: can_edit_issuable, signed_in: current_user.present? = render_if_exists 'shared/issuable/sidebar_item_epic', issuable: issuable diff --git a/app/views/shared/issuable/form/_metadata_merge_request_assignee.html.haml b/app/views/shared/issuable/form/_metadata_merge_request_assignee.html.haml index 3521f71f409..60c34094108 100644 --- a/app/views/shared/issuable/form/_metadata_merge_request_assignee.html.haml +++ b/app/views/shared/issuable/form/_metadata_merge_request_assignee.html.haml @@ -5,4 +5,4 @@ = dropdown_tag(user_dropdown_label(issuable.assignee_id, "Assignee"), options: { toggle_class: "js-dropdown-keep-input js-user-search js-issuable-form-dropdown js-assignee-search", title: "Select assignee", filter: true, dropdown_class: "dropdown-menu-user dropdown-menu-selectable dropdown-menu-assignee js-filter-submit", placeholder: "Search assignee", data: { first_user: current_user.try(:username), null_user: true, current_user: true, project_id: issuable.project.try(:id), selected: issuable.assignee_id, field_name: "#{issuable.class.model_name.param_key}[assignee_id]", default_label: "Assignee"} }) - = link_to 'Assign to me', '#', class: "assign-to-me-link #{'hide' if issuable.assignee_id == current_user.id}" + = link_to 'Assign to me', '#', class: "assign-to-me-link qa-assign-to-me-link #{'hide' if issuable.assignee_id == current_user.id}" |