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
5cb80624
Commit
5cb80624
authored
Dec 01, 2020
by
Andrew Fontaine
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'tz-treeshake-bootstrap-js' into 'master'
Treeshake bootstrap.js See merge request gitlab-org/gitlab!48682
parents
150af52b
d5bbc242
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
1 deletion
+21
-1
app/assets/javascripts/commons/bootstrap.js
app/assets/javascripts/commons/bootstrap.js
+8
-1
config/webpack.config.js
config/webpack.config.js
+12
-0
ee/app/assets/javascripts/main_ee.js
ee/app/assets/javascripts/main_ee.js
+1
-0
No files found.
app/assets/javascripts/commons/bootstrap.js
View file @
5cb80624
import
$
from
'
jquery
'
;
import
$
from
'
jquery
'
;
// bootstrap jQuery plugins
// bootstrap jQuery plugins
import
'
bootstrap
'
;
import
'
bootstrap/js/dist/alert
'
;
import
'
bootstrap/js/dist/button
'
;
import
'
bootstrap/js/dist/collapse
'
;
import
'
bootstrap/js/dist/modal
'
;
import
'
bootstrap/js/dist/dropdown
'
;
import
'
bootstrap/js/dist/popover
'
;
import
'
bootstrap/js/dist/tooltip
'
;
import
'
bootstrap/js/dist/tab
'
;
// custom jQuery functions
// custom jQuery functions
$
.
fn
.
extend
({
$
.
fn
.
extend
({
...
...
config/webpack.config.js
View file @
5cb80624
...
@@ -362,6 +362,18 @@ module.exports = {
...
@@ -362,6 +362,18 @@ module.exports = {
new
webpack
.
ProvidePlugin
({
new
webpack
.
ProvidePlugin
({
$
:
'
jquery
'
,
$
:
'
jquery
'
,
jQuery
:
'
jquery
'
,
jQuery
:
'
jquery
'
,
Popper
:
[
'
popper.js
'
,
'
default
'
],
Alert
:
'
exports-loader?Alert!bootstrap/js/dist/alert
'
,
Button
:
'
exports-loader?Button!bootstrap/js/dist/button
'
,
Carousel
:
'
exports-loader?Carousel!bootstrap/js/dist/carousel
'
,
Collapse
:
'
exports-loader?Collapse!bootstrap/js/dist/collapse
'
,
Dropdown
:
'
exports-loader?Dropdown!bootstrap/js/dist/dropdown
'
,
Modal
:
'
exports-loader?Modal!bootstrap/js/dist/modal
'
,
Popover
:
'
exports-loader?Popover!bootstrap/js/dist/popover
'
,
Scrollspy
:
'
exports-loader?Scrollspy!bootstrap/js/dist/scrollspy
'
,
Tab
:
'
exports-loader?Tab!bootstrap/js/dist/tab
'
,
Tooltip
:
'
exports-loader?Tooltip!bootstrap/js/dist/tooltip
'
,
Util
:
'
exports-loader?Util!bootstrap/js/dist/util
'
,
}),
}),
// if DLLs are enabled, detect whether the DLL exists and create it automatically if necessary
// if DLLs are enabled, detect whether the DLL exists and create it automatically if necessary
...
...
ee/app/assets/javascripts/main_ee.js
View file @
5cb80624
import
$
from
'
jquery
'
;
import
$
from
'
jquery
'
;
import
'
bootstrap/js/dist/modal
'
;
import
initEETrialBanner
from
'
ee/ee_trial_banner
'
;
import
initEETrialBanner
from
'
ee/ee_trial_banner
'
;
import
trackNavbarEvents
from
'
ee/event_tracking/navbar
'
;
import
trackNavbarEvents
from
'
ee/event_tracking/navbar
'
;
import
initNamespaceStorageLimitAlert
from
'
ee/namespace_storage_limit_alert
'
;
import
initNamespaceStorageLimitAlert
from
'
ee/namespace_storage_limit_alert
'
;
...
...
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