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
0e50e9d9
Commit
0e50e9d9
authored
Dec 20, 2017
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update dispatcher to allow for dynamic imports until webpack plugin is updated
parent
58b8b807
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
app/assets/javascripts/dispatcher.js
app/assets/javascripts/dispatcher.js
+3
-1
app/assets/javascripts/pages/users/show/index.js
app/assets/javascripts/pages/users/show/index.js
+3
-0
No files found.
app/assets/javascripts/dispatcher.js
View file @
0e50e9d9
...
@@ -111,6 +111,8 @@ import Activities from './activities';
...
@@ -111,6 +111,8 @@ import Activities from './activities';
return
false
;
return
false
;
}
}
const
fail
=
()
=>
Flash
(
'
Error loading dynamic module
'
);
path
=
page
.
split
(
'
:
'
);
path
=
page
.
split
(
'
:
'
);
shortcut_handler
=
null
;
shortcut_handler
=
null
;
...
@@ -545,7 +547,7 @@ import Activities from './activities';
...
@@ -545,7 +547,7 @@ import Activities from './activities';
new
CILintEditor
();
new
CILintEditor
();
break
;
break
;
case
'
users:show
'
:
case
'
users:show
'
:
new
UserCallout
(
);
import
(
'
./pages/users/show
'
).
then
(
m
=>
m
.
default
()).
catch
(
fail
);
break
;
break
;
case
'
admin:conversational_development_index:show
'
:
case
'
admin:conversational_development_index:show
'
:
new
UserCallout
();
new
UserCallout
();
...
...
app/assets/javascripts/pages/users/show/index.js
0 → 100644
View file @
0e50e9d9
import
UserCallout
from
'
~/user_callout
'
;
export
default
()
=>
new
UserCallout
();
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