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
4ef0dd4e
Commit
4ef0dd4e
authored
Oct 12, 2020
by
Rajat Jain
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix swimlanes duplicate epics
Unite them by using `epic.id`
parent
f882fef9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
2 deletions
+18
-2
ee/app/assets/javascripts/boards/stores/mutations.js
ee/app/assets/javascripts/boards/stores/mutations.js
+2
-2
ee/changelogs/unreleased/swimlane-dups.yml
ee/changelogs/unreleased/swimlane-dups.yml
+5
-0
ee/spec/frontend/boards/stores/mutations_spec.js
ee/spec/frontend/boards/stores/mutations_spec.js
+11
-0
No files found.
ee/app/assets/javascripts/boards/stores/mutations.js
View file @
4ef0dd4e
import
Vue
from
'
vue
'
;
import
{
union
}
from
'
lodash
'
;
import
{
union
,
unionBy
}
from
'
lodash
'
;
import
mutationsCE
,
{
addIssueToList
,
removeIssueFromList
}
from
'
~/boards/stores/mutations
'
;
import
{
moveIssueListHelper
}
from
'
~/boards/boards_util
'
;
import
{
s__
}
from
'
~/locale
'
;
...
...
@@ -130,7 +130,7 @@ export default {
},
[
mutationTypes
.
RECEIVE_EPICS_SUCCESS
]:
(
state
,
epics
)
=>
{
Vue
.
set
(
state
,
'
epics
'
,
union
(
state
.
epics
||
[],
epics
));
Vue
.
set
(
state
,
'
epics
'
,
union
By
(
state
.
epics
||
[],
epics
,
'
id
'
));
},
[
mutationTypes
.
RESET_EPICS
]:
state
=>
{
...
...
ee/changelogs/unreleased/swimlane-dups.yml
0 → 100644
View file @
4ef0dd4e
---
title
:
Fix swimlanes duplicate epics
merge_request
:
44728
author
:
type
:
fixed
ee/spec/frontend/boards/stores/mutations_spec.js
View file @
4ef0dd4e
...
...
@@ -232,6 +232,17 @@ describe('RECEIVE_EPICS_SUCCESS', () => {
expect
(
state
.
epics
).
toEqual
(
mockEpics
);
});
it
(
"
doesn't add duplicate epics
"
,
()
=>
{
state
=
{
...
state
,
epics
:
mockEpics
,
};
mutations
.
RECEIVE_EPICS_SUCCESS
(
state
,
mockEpics
);
expect
(
state
.
epics
).
toEqual
(
mockEpics
);
});
});
describe
(
'
RESET_EPICS
'
,
()
=>
{
...
...
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