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
Boxiang Sun
gitlab-ce
Commits
eefd1743
Commit
eefd1743
authored
Feb 28, 2018
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove the "test" bundle and apply it conditionally within main.js
parent
bb41a889
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
5 deletions
+5
-5
app/assets/javascripts/main.js
app/assets/javascripts/main.js
+5
-2
app/assets/javascripts/test.js
app/assets/javascripts/test.js
+0
-1
app/views/layouts/_head.html.haml
app/views/layouts/_head.html.haml
+0
-1
config/webpack.config.js
config/webpack.config.js
+0
-1
No files found.
app/assets/javascripts/main.js
View file @
eefd1743
...
@@ -36,8 +36,11 @@ import initBreadcrumbs from './breadcrumb';
...
@@ -36,8 +36,11 @@ import initBreadcrumbs from './breadcrumb';
import
initDispatcher
from
'
./dispatcher
'
;
import
initDispatcher
from
'
./dispatcher
'
;
// eslint-disable-next-line global-require, import/no-commonjs
// inject test utilities if necessary
if
(
process
.
env
.
NODE_ENV
!==
'
production
'
)
require
(
'
./test_utils/
'
);
if
(
process
.
env
.
NODE_ENV
!==
'
production
'
&&
gon
&&
gon
.
test_env
)
{
$
.
fx
.
off
=
true
;
import
(
/* webpackMode: "eager" */
'
./test_utils/
'
);
}
svg4everybody
();
svg4everybody
();
...
...
app/assets/javascripts/test.js
deleted
100644 → 0
View file @
bb41a889
$
.
fx
.
off
=
true
;
app/views/layouts/_head.html.haml
View file @
eefd1743
...
@@ -42,7 +42,6 @@
...
@@ -42,7 +42,6 @@
=
webpack_bundle_tag
"common"
=
webpack_bundle_tag
"common"
=
webpack_bundle_tag
"main"
=
webpack_bundle_tag
"main"
=
webpack_bundle_tag
"raven"
if
Gitlab
::
CurrentSettings
.
clientside_sentry_enabled
=
webpack_bundle_tag
"raven"
if
Gitlab
::
CurrentSettings
.
clientside_sentry_enabled
=
webpack_bundle_tag
"test"
if
Rails
.
env
.
test?
-
if
content_for?
(
:page_specific_javascripts
)
-
if
content_for?
(
:page_specific_javascripts
)
=
yield
:page_specific_javascripts
=
yield
:page_specific_javascripts
...
...
config/webpack.config.js
View file @
eefd1743
...
@@ -56,7 +56,6 @@ function generateEntries() {
...
@@ -56,7 +56,6 @@ function generateEntries() {
main
:
'
./main.js
'
,
main
:
'
./main.js
'
,
ide
:
'
./ide/index.js
'
,
ide
:
'
./ide/index.js
'
,
raven
:
'
./raven/index.js
'
,
raven
:
'
./raven/index.js
'
,
test
:
'
./test.js
'
,
webpack_runtime
:
'
./webpack.js
'
,
webpack_runtime
:
'
./webpack.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