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
a932042a
Commit
a932042a
authored
Jul 06, 2020
by
Rajat Jain
Committed by
Eugenia Grieff
Jul 06, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Async import epics_select_bundle
parent
1f775605
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
19 deletions
+9
-19
app/assets/javascripts/issuable_bulk_update_sidebar.js
app/assets/javascripts/issuable_bulk_update_sidebar.js
+7
-3
app/views/shared/issuable/_bulk_update_sidebar.html.haml
app/views/shared/issuable/_bulk_update_sidebar.html.haml
+0
-8
ee/app/services/ee/issuable/bulk_update_service.rb
ee/app/services/ee/issuable/bulk_update_service.rb
+0
-2
ee/spec/services/ee/issuable/bulk_update_service_spec.rb
ee/spec/services/ee/issuable/bulk_update_service_spec.rb
+2
-6
No files found.
app/assets/javascripts/issuable_bulk_update_sidebar.js
View file @
a932042a
...
...
@@ -8,7 +8,6 @@ import issueStatusSelect from './issue_status_select';
import
subscriptionSelect
from
'
./subscription_select
'
;
import
LabelsSelect
from
'
./labels_select
'
;
import
issueableEventHub
from
'
./issuables_list/eventhub
'
;
import
EpicSelect
from
'
ee_else_ce/vue_shared/components/sidebar/epics_select/epics_select_bundle
'
;
const
HIDDEN_CLASS
=
'
hidden
'
;
const
DISABLED_CONTENT_CLASS
=
'
disabled-content
'
;
...
...
@@ -72,8 +71,13 @@ export default class IssuableBulkUpdateSidebar {
})
.
catch
(()
=>
{});
}
if
(
EpicSelect
)
{
EpicSelect
();
if
(
IS_EE
)
{
import
(
'
ee/vue_shared/components/sidebar/epics_select/epics_select_bundle
'
)
.
then
(({
default
:
EpicSelect
})
=>
{
EpicSelect
();
})
.
catch
(()
=>
{});
}
}
...
...
app/views/shared/issuable/_bulk_update_sidebar.html.haml
View file @
a932042a
...
...
@@ -52,13 +52,6 @@
.filter-item.health-status.health-status-filter
#js-bulk-update-health-status-root
%input
{
id:
'issue_health_status_value'
,
type:
'hidden'
,
name:
'update[health_status]'
}
-
if
epic_bulk_edit_flag
.block
.title
=
_
(
'Epic'
)
.filter-item.epic-bulk-edit
#js-epic-select-root
{
data:
{
group_id:
@project
&
.
group
&
.
id
,
show_header:
"true"
}
}
%input
{
id:
'issue_epic_id'
,
type:
'hidden'
,
name:
'update[epic_id]'
}
.block
.title
=
_
(
'Subscriptions'
)
...
...
@@ -72,6 +65,5 @@
%a
{
href:
"#"
,
data:
{
id:
"unsubscribe"
}
}
=
_
(
'Unsubscribe'
)
=
hidden_field_tag
"update[issuable_ids]"
,
[]
=
hidden_field_tag
:state_event
,
params
[
:state_event
]
ee/app/services/ee/issuable/bulk_update_service.rb
View file @
a932042a
...
...
@@ -27,8 +27,6 @@ module EE
set_health_status
set_epic_param
params
end
def
set_health_status
...
...
ee/spec/services/ee/issuable/bulk_update_service_spec.rb
View file @
a932042a
...
...
@@ -21,7 +21,7 @@ RSpec.describe Issuable::BulkUpdateService do
end
shared_examples
'does not update issuables attribute'
do
|
attribute
|
it
'
raises record not found error
'
do
it
'
does not update attribute
'
do
issuables
.
each
do
|
issuable
|
expect
{
subject
}.
not_to
change
{
issuable
.
send
(
attribute
)
}
end
...
...
@@ -159,11 +159,7 @@ RSpec.describe Issuable::BulkUpdateService do
stub_licensed_features
(
epics:
false
)
end
it
'does not update issuables attribute'
do
issuables
.
each
do
|
issuable
|
expect
{
subject
}.
not_to
change
{
issuable
.
labels
}
end
end
it_behaves_like
'does not update issuables attribute'
,
:labels
end
context
'when issuable_ids contain external epics'
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