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
874db91c
Commit
874db91c
authored
May 12, 2020
by
Tom Quirk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use class for bootstrapping Design Mgmt
parent
91b825c5
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
app/assets/javascripts/design_management/index.js
app/assets/javascripts/design_management/index.js
+1
-1
app/assets/javascripts/pages/projects/issues/show.js
app/assets/javascripts/pages/projects/issues/show.js
+2
-2
ee/app/views/projects/issues/_discussion.html.haml
ee/app/views/projects/issues/_discussion.html.haml
+1
-1
No files found.
app/assets/javascripts/design_management/index.js
View file @
874db91c
...
@@ -7,7 +7,7 @@ import getDesignListQuery from './graphql/queries/get_design_list.query.graphql'
...
@@ -7,7 +7,7 @@ import getDesignListQuery from './graphql/queries/get_design_list.query.graphql'
import
{
DESIGNS_ROUTE_NAME
,
ROOT_ROUTE_NAME
}
from
'
./router/constants
'
;
import
{
DESIGNS_ROUTE_NAME
,
ROOT_ROUTE_NAME
}
from
'
./router/constants
'
;
export
default
()
=>
{
export
default
()
=>
{
const
el
=
document
.
getElementById
(
'
js-design-management
'
);
const
el
=
document
.
querySelector
(
'
.
js-design-management
'
);
const
badge
=
document
.
querySelector
(
'
.js-designs-count
'
);
const
badge
=
document
.
querySelector
(
'
.js-designs-count
'
);
const
{
issueIid
,
projectPath
,
issuePath
}
=
el
.
dataset
;
const
{
issueIid
,
projectPath
,
issuePath
}
=
el
.
dataset
;
const
router
=
createRouter
(
issuePath
);
const
router
=
createRouter
(
issuePath
);
...
...
app/assets/javascripts/pages/projects/issues/show.js
View file @
874db91c
...
@@ -13,10 +13,10 @@ export default function() {
...
@@ -13,10 +13,10 @@ export default function() {
initSentryErrorStackTraceApp
();
initSentryErrorStackTraceApp
();
initRelatedMergeRequestsApp
();
initRelatedMergeRequestsApp
();
// js-design-management is currently EE-only.
//
.
js-design-management is currently EE-only.
// This will be moved to CE as part of https://gitlab.com/gitlab-org/gitlab/-/issues/212566#frontend
// This will be moved to CE as part of https://gitlab.com/gitlab-org/gitlab/-/issues/212566#frontend
// at which point this conditional can be removed.
// at which point this conditional can be removed.
if
(
document
.
getElementById
(
'
js-design-management
'
))
{
if
(
document
.
querySelector
(
'
.
js-design-management
'
))
{
import
(
/* webpackChunkName: 'design_management' */
'
~/design_management
'
)
import
(
/* webpackChunkName: 'design_management' */
'
~/design_management
'
)
.
then
(
module
=>
module
.
default
())
.
then
(
module
=>
module
.
default
())
.
catch
(()
=>
{});
.
catch
(()
=>
{});
...
...
ee/app/views/projects/issues/_discussion.html.haml
View file @
874db91c
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
=
render_ce
'projects/issues/discussion'
=
render_ce
'projects/issues/discussion'
#designs-tab
.tab-pane
{
role:
'tabpanel'
,
'aria-labelledby'
:
'designs'
,
data:
{
qa_selector:
'designs_tab_content'
}
}
#designs-tab
.tab-pane
{
role:
'tabpanel'
,
'aria-labelledby'
:
'designs'
,
data:
{
qa_selector:
'designs_tab_content'
}
}
-
if
@project
.
design_management_enabled?
-
if
@project
.
design_management_enabled?
#
js-design-management
{
data:
{
project_path:
@project
.
full_path
,
issue_iid:
@issue
.
iid
,
issue_path:
project_issue_path
(
@project
,
@issue
)
}
}
.
js-design-management
{
data:
{
project_path:
@project
.
full_path
,
issue_iid:
@issue
.
iid
,
issue_path:
project_issue_path
(
@project
,
@issue
)
}
}
-
else
-
else
.mt-4
.mt-4
.row.empty-state
.row.empty-state
...
...
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