Commit 93796580 authored by Jose Ivan Vargas's avatar Jose Ivan Vargas

Merge branch '20033-remove-status-in-merged-tab' into 'master'

Remove status dropdown in merged tab

Closes #20033

See merge request gitlab-org/gitlab!37544
parents ca5c28aa ddee7859
...@@ -9,18 +9,19 @@ ...@@ -9,18 +9,19 @@
.filter-item.inline.update-issues-btn.float-left .filter-item.inline.update-issues-btn.float-left
= button_tag _('Update all'), class: "btn update-selected-issues btn-info", disabled: true = button_tag _('Update all'), class: "btn update-selected-issues btn-info", disabled: true
= button_tag _('Cancel'), class: "btn btn-default js-bulk-update-menu-hide float-right" = button_tag _('Cancel'), class: "btn btn-default js-bulk-update-menu-hide float-right"
.block - if params[:state] != 'merged'
.title .block
= _('Status') .title
.filter-item = _('Status')
= dropdown_tag(_("Select status"), options: { toggle_class: "js-issue-status", title: _("Change status"), dropdown_class: "dropdown-menu-status dropdown-menu-selectable", data: { field_name: "update[state_event]", default_label: _("Status") } } ) do .filter-item
%ul = dropdown_tag(_("Select status"), options: { toggle_class: "js-issue-status", title: _("Change status"), dropdown_class: "dropdown-menu-status dropdown-menu-selectable", data: { field_name: "update[state_event]", default_label: _("Status") } } ) do
%li %ul
%a{ href: "#", data: { id: "reopen" } } %li
= _('Open') %a{ href: "#", data: { id: "reopen" } }
%li = _('Open')
%a{ href: "#", data: { id: "close" } } %li
= _('Closed') %a{ href: "#", data: { id: "close" } }
= _('Closed')
.block .block
.title .title
= _('Assignee') = _('Assignee')
......
---
title: Remove status dropdown in merged tab
merge_request: 37544
author:
type: fixed
...@@ -37,6 +37,15 @@ RSpec.describe 'Merge requests > User mass updates', :js do ...@@ -37,6 +37,15 @@ RSpec.describe 'Merge requests > User mass updates', :js do
expect(page).to have_selector('.merge-request', count: 0) expect(page).to have_selector('.merge-request', count: 0)
end end
end end
it 'does not exist in merged state' do
merge_request.close
visit project_merge_requests_path(project, state: 'merged')
click_button 'Edit merge requests'
expect(page).not_to have_css('.js-issue-status')
end
end end
context 'assignee' do context 'assignee' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment