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
0
Merge Requests
0
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
Léo-Paul Géneau
gitlab-ce
Commits
87359533
Commit
87359533
authored
Feb 23, 2018
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove sidebar bundle webpack entry point
parent
296a4e68
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
12 additions
and
8 deletions
+12
-8
app/assets/javascripts/pages/projects/issues/show/index.js
app/assets/javascripts/pages/projects/issues/show/index.js
+2
-0
app/assets/javascripts/pages/projects/merge_requests/conflicts/index.js
...ascripts/pages/projects/merge_requests/conflicts/index.js
+3
-0
app/assets/javascripts/pages/projects/merge_requests/conflicts/show/index.js
...pts/pages/projects/merge_requests/conflicts/show/index.js
+3
-0
app/assets/javascripts/pages/projects/merge_requests/show/index.js
...s/javascripts/pages/projects/merge_requests/show/index.js
+2
-0
app/assets/javascripts/sidebar/sidebar_bundle.js
app/assets/javascripts/sidebar/sidebar_bundle.js
+2
-6
app/views/shared/issuable/_sidebar.html.haml
app/views/shared/issuable/_sidebar.html.haml
+0
-1
config/webpack.config.js
config/webpack.config.js
+0
-1
No files found.
app/assets/javascripts/pages/projects/issues/show/index.js
View file @
87359533
import
initIssuableSidebar
from
'
~/init_issuable_sidebar
'
;
import
initIssuableSidebar
from
'
~/init_issuable_sidebar
'
;
import
initSidebarBundle
from
'
~/sidebar/sidebar_bundle
'
;
import
Issue
from
'
~/issue
'
;
import
Issue
from
'
~/issue
'
;
import
ShortcutsIssuable
from
'
~/shortcuts_issuable
'
;
import
ShortcutsIssuable
from
'
~/shortcuts_issuable
'
;
import
ZenMode
from
'
~/zen_mode
'
;
import
ZenMode
from
'
~/zen_mode
'
;
...
@@ -10,4 +11,5 @@ document.addEventListener('DOMContentLoaded', () => {
...
@@ -10,4 +11,5 @@ document.addEventListener('DOMContentLoaded', () => {
new
ShortcutsIssuable
();
// eslint-disable-line no-new
new
ShortcutsIssuable
();
// eslint-disable-line no-new
new
ZenMode
();
// eslint-disable-line no-new
new
ZenMode
();
// eslint-disable-line no-new
initIssuableSidebar
();
initIssuableSidebar
();
initSidebarBundle
();
});
});
app/assets/javascripts/pages/projects/merge_requests/conflicts/index.js
0 → 100644
View file @
87359533
import
initSidebarBundle
from
'
~/sidebar/sidebar_bundle
'
;
document
.
addEventListener
(
'
DOMContentLoaded
'
,
initSidebarBundle
);
app/assets/javascripts/pages/projects/merge_requests/conflicts/show/index.js
0 → 100644
View file @
87359533
import
initSidebarBundle
from
'
~/sidebar/sidebar_bundle
'
;
document
.
addEventListener
(
'
DOMContentLoaded
'
,
initSidebarBundle
);
app/assets/javascripts/pages/projects/merge_requests/show/index.js
View file @
87359533
...
@@ -3,6 +3,7 @@ import ZenMode from '~/zen_mode';
...
@@ -3,6 +3,7 @@ import ZenMode from '~/zen_mode';
import
initNotes
from
'
~/init_notes
'
;
import
initNotes
from
'
~/init_notes
'
;
import
initIssuableSidebar
from
'
~/init_issuable_sidebar
'
;
import
initIssuableSidebar
from
'
~/init_issuable_sidebar
'
;
import
initDiffNotes
from
'
~/diff_notes/diff_notes_bundle
'
;
import
initDiffNotes
from
'
~/diff_notes/diff_notes_bundle
'
;
import
initSidebarBundle
from
'
~/sidebar/sidebar_bundle
'
;
import
ShortcutsIssuable
from
'
~/shortcuts_issuable
'
;
import
ShortcutsIssuable
from
'
~/shortcuts_issuable
'
;
import
Diff
from
'
~/diff
'
;
import
Diff
from
'
~/diff
'
;
import
{
handleLocationHash
}
from
'
~/lib/utils/common_utils
'
;
import
{
handleLocationHash
}
from
'
~/lib/utils/common_utils
'
;
...
@@ -13,6 +14,7 @@ document.addEventListener('DOMContentLoaded', () => {
...
@@ -13,6 +14,7 @@ document.addEventListener('DOMContentLoaded', () => {
new
ZenMode
();
// eslint-disable-line no-new
new
ZenMode
();
// eslint-disable-line no-new
initIssuableSidebar
();
initIssuableSidebar
();
initSidebarBundle
();
initNotes
();
initNotes
();
initDiffNotes
();
initDiffNotes
();
...
...
app/assets/javascripts/sidebar/sidebar_bundle.js
View file @
87359533
import
Mediator
from
'
./sidebar_mediator
'
;
import
Mediator
from
'
./sidebar_mediator
'
;
import
{
mountSidebar
,
getSidebarOptions
}
from
'
./mount_sidebar
'
;
import
{
mountSidebar
,
getSidebarOptions
}
from
'
./mount_sidebar
'
;
function
domContentLoaded
()
{
export
default
()
=>
{
const
mediator
=
new
Mediator
(
getSidebarOptions
());
const
mediator
=
new
Mediator
(
getSidebarOptions
());
mediator
.
fetch
();
mediator
.
fetch
();
mountSidebar
(
mediator
);
mountSidebar
(
mediator
);
}
};
document
.
addEventListener
(
'
DOMContentLoaded
'
,
domContentLoaded
);
export
default
domContentLoaded
;
app/views/shared/issuable/_sidebar.html.haml
View file @
87359533
-
todo
=
issuable_todo
(
issuable
)
-
todo
=
issuable_todo
(
issuable
)
-
content_for
:page_specific_javascripts
do
-
content_for
:page_specific_javascripts
do
=
webpack_bundle_tag
(
'common_vue'
)
=
webpack_bundle_tag
(
'common_vue'
)
=
webpack_bundle_tag
(
'sidebar'
)
%aside
.right-sidebar.js-right-sidebar.js-issuable-sidebar
{
data:
{
signed:
{
in:
current_user
.
present?
}
},
class:
sidebar_gutter_collapsed_class
,
'aria-live'
=>
'polite'
}
%aside
.right-sidebar.js-right-sidebar.js-issuable-sidebar
{
data:
{
signed:
{
in:
current_user
.
present?
}
},
class:
sidebar_gutter_collapsed_class
,
'aria-live'
=>
'polite'
}
.issuable-sidebar
{
data:
{
endpoint:
"#{issuable_json_path(issuable)}"
}
}
.issuable-sidebar
{
data:
{
endpoint:
"#{issuable_json_path(issuable)}"
}
}
...
...
config/webpack.config.js
View file @
87359533
...
@@ -72,7 +72,6 @@ var config = {
...
@@ -72,7 +72,6 @@ var config = {
protected_branches
:
'
./protected_branches
'
,
protected_branches
:
'
./protected_branches
'
,
protected_tags
:
'
./protected_tags
'
,
protected_tags
:
'
./protected_tags
'
,
registry_list
:
'
./registry/index.js
'
,
registry_list
:
'
./registry/index.js
'
,
sidebar
:
'
./sidebar/sidebar_bundle.js
'
,
snippet
:
'
./snippet/snippet_bundle.js
'
,
snippet
:
'
./snippet/snippet_bundle.js
'
,
sketch_viewer
:
'
./blob/sketch_viewer.js
'
,
sketch_viewer
:
'
./blob/sketch_viewer.js
'
,
stl_viewer
:
'
./blob/stl_viewer.js
'
,
stl_viewer
:
'
./blob/stl_viewer.js
'
,
...
...
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