Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
ddee7859
Commit
ddee7859
authored
Jul 21, 2020
by
Samantha Ming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove status dropdown in merged tab
Issue:
https://gitlab.com/gitlab-org/gitlab/-/issues/20033
parent
bb8f2445
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
27 additions
and
12 deletions
+27
-12
app/views/shared/issuable/_bulk_update_sidebar.html.haml
app/views/shared/issuable/_bulk_update_sidebar.html.haml
+13
-12
changelogs/unreleased/20033-remove-status-in-merged-tab.yml
changelogs/unreleased/20033-remove-status-in-merged-tab.yml
+5
-0
spec/features/merge_requests/user_mass_updates_spec.rb
spec/features/merge_requests/user_mass_updates_spec.rb
+9
-0
No files found.
app/views/shared/issuable/_bulk_update_sidebar.html.haml
View file @
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'
)
...
...
changelogs/unreleased/20033-remove-status-in-merged-tab.yml
0 → 100644
View file @
ddee7859
---
title
:
Remove status dropdown in merged tab
merge_request
:
37544
author
:
type
:
fixed
spec/features/merge_requests/user_mass_updates_spec.rb
View file @
ddee7859
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment