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
2f296624
Commit
2f296624
authored
Dec 13, 2021
by
Natalia Tepluhina
Committed by
Simon Knox
Dec 13, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed double boards list query on EE
parent
f7963d40
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
5 additions
and
5 deletions
+5
-5
app/assets/javascripts/boards/components/board_list.vue
app/assets/javascripts/boards/components/board_list.vue
+1
-1
app/assets/javascripts/boards/components/board_list_header.vue
...ssets/javascripts/boards/components/board_list_header.vue
+1
-1
ee/app/assets/javascripts/boards/components/board_list_header.vue
...ssets/javascripts/boards/components/board_list_header.vue
+1
-1
spec/frontend/boards/board_list_helper.js
spec/frontend/boards/board_list_helper.js
+1
-1
spec/frontend/boards/components/board_list_header_spec.js
spec/frontend/boards/components/board_list_header_spec.js
+1
-1
No files found.
app/assets/javascripts/boards/components/board_list.vue
View file @
2f296624
...
...
@@ -6,9 +6,9 @@ import { sortableStart, sortableEnd } from '~/boards/mixins/sortable_default_opt
import
{
sprintf
,
__
}
from
'
~/locale
'
;
import
defaultSortableConfig
from
'
~/sortable/sortable_config
'
;
import
Tracking
from
'
~/tracking
'
;
import
listQuery
from
'
ee_else_ce/boards/graphql/board_lists_deferred.query.graphql
'
;
import
{
toggleFormEventPrefix
,
DraggableItemTypes
}
from
'
../constants
'
;
import
eventHub
from
'
../eventhub
'
;
import
listQuery
from
'
../graphql/board_lists_deferred.query.graphql
'
;
import
BoardCard
from
'
./board_card.vue
'
;
import
BoardNewIssue
from
'
./board_new_issue.vue
'
;
...
...
app/assets/javascripts/boards/components/board_list_header.vue
View file @
2f296624
...
...
@@ -17,10 +17,10 @@ import sidebarEventHub from '~/sidebar/event_hub';
import
Tracking
from
'
~/tracking
'
;
import
{
formatDate
}
from
'
~/lib/utils/datetime_utility
'
;
import
glFeatureFlagMixin
from
'
~/vue_shared/mixins/gl_feature_flags_mixin
'
;
import
listQuery
from
'
ee_else_ce/boards/graphql/board_lists_deferred.query.graphql
'
;
import
AccessorUtilities
from
'
../../lib/utils/accessor
'
;
import
{
inactiveId
,
LIST
,
ListType
,
toggleFormEventPrefix
}
from
'
../constants
'
;
import
eventHub
from
'
../eventhub
'
;
import
listQuery
from
'
../graphql/board_lists_deferred.query.graphql
'
;
import
ItemCount
from
'
./item_count.vue
'
;
export
default
{
...
...
ee/app/assets/javascripts/boards/components/board_list_header.vue
View file @
2f296624
...
...
@@ -5,7 +5,7 @@ import { mapGetters } from 'vuex';
/* eslint-disable @gitlab/no-runtime-template-compiler */
import
BoardListHeaderFoss
from
'
~/boards/components/board_list_header.vue
'
;
import
{
n__
,
__
,
sprintf
}
from
'
~/locale
'
;
import
listQuery
from
'
..
/graphql/board_lists_deferred.query.graphql
'
;
import
listQuery
from
'
ee_else_ce/boards
/graphql/board_lists_deferred.query.graphql
'
;
export
default
{
extends
:
BoardListHeaderFoss
,
...
...
spec/frontend/boards/board_list_helper.js
View file @
2f296624
...
...
@@ -8,7 +8,7 @@ import BoardNewIssue from '~/boards/components/board_new_issue.vue';
import
BoardNewItem
from
'
~/boards/components/board_new_item.vue
'
;
import
defaultState
from
'
~/boards/stores/state
'
;
import
createMockApollo
from
'
helpers/mock_apollo_helper
'
;
import
listQuery
from
'
~
/boards/graphql/board_lists_deferred.query.graphql
'
;
import
listQuery
from
'
ee_else_ce
/boards/graphql/board_lists_deferred.query.graphql
'
;
import
{
mockList
,
mockIssuesByListId
,
...
...
spec/frontend/boards/components/board_list_header_spec.js
View file @
2f296624
...
...
@@ -8,7 +8,7 @@ import { extendedWrapper } from 'helpers/vue_test_utils_helper';
import
{
boardListQueryResponse
,
mockLabelList
}
from
'
jest/boards/mock_data
'
;
import
BoardListHeader
from
'
~/boards/components/board_list_header.vue
'
;
import
{
ListType
}
from
'
~/boards/constants
'
;
import
listQuery
from
'
~
/boards/graphql/board_lists_deferred.query.graphql
'
;
import
listQuery
from
'
ee_else_ce
/boards/graphql/board_lists_deferred.query.graphql
'
;
Vue
.
use
(
VueApollo
);
Vue
.
use
(
Vuex
);
...
...
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