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
65bdcf16
Commit
65bdcf16
authored
Aug 18, 2021
by
Florie Guibert
Committed by
Simon Knox
Aug 18, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Prevent loading of legacy sidebar on epic and graphQL boards
parent
676c2ef8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
app/views/shared/boards/_show.html.haml
app/views/shared/boards/_show.html.haml
+4
-2
ee/app/assets/javascripts/epic_boards/index.js
ee/app/assets/javascripts/epic_boards/index.js
+0
-2
No files found.
app/views/shared/boards/_show.html.haml
View file @
65bdcf16
...
@@ -4,7 +4,8 @@
...
@@ -4,7 +4,8 @@
-
@no_container
=
true
-
@no_container
=
true
-
@content_wrapper_class
=
"
#{
@content_wrapper_class
}
gl-relative"
-
@content_wrapper_class
=
"
#{
@content_wrapper_class
}
gl-relative"
-
@content_class
=
"issue-boards-content js-focus-mode-board"
-
@content_class
=
"issue-boards-content js-focus-mode-board"
-
if
board
.
to_type
==
"EpicBoard"
-
is_epic_board
=
board
.
to_type
==
"EpicBoard"
-
if
is_epic_board
-
breadcrumb_title
_
(
"Epic Boards"
)
-
breadcrumb_title
_
(
"Epic Boards"
)
-
else
-
else
-
breadcrumb_title
_
(
"Issue Boards"
)
-
breadcrumb_title
_
(
"Issue Boards"
)
...
@@ -19,5 +20,6 @@
...
@@ -19,5 +20,6 @@
=
render
'shared/issuable/search_bar'
,
type: :boards
,
board:
board
=
render
'shared/issuable/search_bar'
,
type: :boards
,
board:
board
#board-app
.boards-app.position-relative
{
"v-cloak"
=>
"true"
,
data:
board_data
,
":class"
=>
"{ 'is-compact': detailIssueVisible }"
}
#board-app
.boards-app.position-relative
{
"v-cloak"
=>
"true"
,
data:
board_data
,
":class"
=>
"{ 'is-compact': detailIssueVisible }"
}
%board-content
{
":lists"
=>
"state.lists"
,
":disabled"
=>
"disabled"
}
%board-content
{
":lists"
=>
"state.lists"
,
":disabled"
=>
"disabled"
}
=
render
"shared/boards/components/sidebar"
,
group:
group
-
if
!
is_epic_board
&&
!
Feature
.
enabled?
(
:graphql_board_lists
,
default_enabled: :yaml
)
=
render
"shared/boards/components/sidebar"
,
group:
group
%board-settings-sidebar
%board-settings-sidebar
ee/app/assets/javascripts/epic_boards/index.js
View file @
65bdcf16
...
@@ -9,7 +9,6 @@ import { mapActions, mapState } from 'vuex';
...
@@ -9,7 +9,6 @@ import { mapActions, mapState } from 'vuex';
import
initFilteredSearch
from
'
ee/boards/epic_filtered_search
'
;
import
initFilteredSearch
from
'
ee/boards/epic_filtered_search
'
;
import
{
fullEpicBoardId
,
transformBoardConfig
}
from
'
ee_component/boards/boards_util
'
;
import
{
fullEpicBoardId
,
transformBoardConfig
}
from
'
ee_component/boards/boards_util
'
;
import
BoardSidebar
from
'
ee_component/boards/components/board_sidebar
'
;
import
toggleLabels
from
'
ee_component/boards/toggle_labels
'
;
import
toggleLabels
from
'
ee_component/boards/toggle_labels
'
;
import
BoardAddNewColumnTrigger
from
'
~/boards/components/board_add_new_column_trigger.vue
'
;
import
BoardAddNewColumnTrigger
from
'
~/boards/components/board_add_new_column_trigger.vue
'
;
...
@@ -63,7 +62,6 @@ export default () => {
...
@@ -63,7 +62,6 @@ export default () => {
el
:
$boardApp
,
el
:
$boardApp
,
components
:
{
components
:
{
BoardContent
,
BoardContent
,
BoardSidebar
,
BoardSettingsSidebar
:
()
=>
import
(
'
~/boards/components/board_settings_sidebar.vue
'
),
BoardSettingsSidebar
:
()
=>
import
(
'
~/boards/components/board_settings_sidebar.vue
'
),
},
},
provide
:
{
provide
:
{
...
...
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