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
aaf03c0c
Commit
aaf03c0c
authored
Jan 23, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
correctly imports performance bar
parent
adf31a57
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
4 deletions
+2
-4
app/views/layouts/_head.html.haml
app/views/layouts/_head.html.haml
+0
-1
config/webpack.config.js
config/webpack.config.js
+2
-3
No files found.
app/views/layouts/_head.html.haml
View file @
aaf03c0c
...
@@ -43,7 +43,6 @@
...
@@ -43,7 +43,6 @@
=
webpack_bundle_tag
"main"
=
webpack_bundle_tag
"main"
=
webpack_bundle_tag
"raven"
if
current_application_settings
.
clientside_sentry_enabled
=
webpack_bundle_tag
"raven"
if
current_application_settings
.
clientside_sentry_enabled
=
webpack_bundle_tag
"test"
if
Rails
.
env
.
test?
=
webpack_bundle_tag
"test"
if
Rails
.
env
.
test?
=
webpack_bundle_tag
'performance_bar'
if
performance_bar_enabled?
-
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 @
aaf03c0c
...
@@ -85,7 +85,6 @@ var config = {
...
@@ -85,7 +85,6 @@ var config = {
test
:
'
./test.js
'
,
test
:
'
./test.js
'
,
two_factor_auth
:
'
./two_factor_auth.js
'
,
two_factor_auth
:
'
./two_factor_auth.js
'
,
users
:
'
./users/index.js
'
,
users
:
'
./users/index.js
'
,
performance_bar
:
'
./performance_bar.js
'
,
webpack_runtime
:
'
./webpack.js
'
,
webpack_runtime
:
'
./webpack.js
'
,
},
},
...
@@ -119,9 +118,9 @@ var config = {
...
@@ -119,9 +118,9 @@ var config = {
{
{
test
:
/
\_
worker
\.
js$/
,
test
:
/
\_
worker
\.
js$/
,
use
:
[
use
:
[
{
{
loader
:
'
worker-loader
'
,
loader
:
'
worker-loader
'
,
options
:
{
options
:
{
inline
:
true
inline
:
true
}
}
},
},
...
...
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