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
Jérome Perrin
gitlab-ce
Commits
b5983a70
Commit
b5983a70
authored
May 06, 2018
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
consolidate main bootstrap entries
parent
de07384b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
9 deletions
+9
-9
app/assets/javascripts/main.js
app/assets/javascripts/main.js
+8
-8
config/webpack.config.js
config/webpack.config.js
+1
-1
No files found.
app/assets/javascripts/main.js
View file @
b5983a70
/* eslint-disable import/first */
/* global $ */
import
jQuery
from
'
jquery
'
;
import
Cookies
from
'
js-cookie
'
;
import
svg4everybody
from
'
svg4everybody
'
;
// expose common libraries as globals (TODO: remove these)
window
.
jQuery
=
jQuery
;
window
.
$
=
jQuery
;
// bootstrap webpack, common libs, polyfills, and behaviors
import
'
./webpack
'
;
import
'
./commons
'
;
import
'
./behaviors
'
;
// lib/utils
import
{
handleLocationHash
,
addSelectOnFocusBehaviour
}
from
'
./lib/utils/common_utils
'
;
import
{
localTimeAgo
}
from
'
./lib/utils/datetime_utility
'
;
import
{
getLocationHash
,
visitUrl
}
from
'
./lib/utils/url_utility
'
;
// behaviors
import
'
./behaviors/
'
;
// everything else
import
loadAwardsHandler
from
'
./awards_handler
'
;
import
bp
from
'
./breakpoints
'
;
...
...
@@ -31,9 +28,12 @@ import initLogoAnimation from './logo';
import
'
./milestone_select
'
;
import
'
./projects_dropdown
'
;
import
initBreadcrumbs
from
'
./breadcrumb
'
;
import
initDispatcher
from
'
./dispatcher
'
;
// expose jQuery as global (TODO: remove these)
window
.
jQuery
=
jQuery
;
window
.
$
=
jQuery
;
// inject test utilities if necessary
if
(
process
.
env
.
NODE_ENV
!==
'
production
'
&&
gon
&&
gon
.
test_env
)
{
$
.
fx
.
off
=
true
;
...
...
config/webpack.config.js
View file @
b5983a70
...
...
@@ -18,7 +18,7 @@ const NO_COMPRESSION = process.env.NO_COMPRESSION;
let
autoEntriesCount
=
0
;
let
watchAutoEntries
=
[];
const
defaultEntries
=
[
'
./
webpack
'
,
'
./commons
'
,
'
./
main
'
];
const
defaultEntries
=
[
'
./main
'
];
function
generateEntries
()
{
// generate automatic entry points
...
...
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