Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
e9c1e6081d60
Commit
1f974331
authored
Mar 02, 2017
by
Mike Greiling
Browse files
merge lib_chart into graphs bundle
parent
f77a5e2e294a
Changes
6
Hide whitespace changes
Inline
Side-by-side
app/assets/javascripts/graphs/graphs_bundle.js
View file @
e9c1e608
import
Chart
from
'
vendor/Chart
'
;
import
ContributorsStatGraph
from
'
./stat_graph_contributors
'
;
// export to global scope
window
.
Chart
=
Chart
;
window
.
ContributorsStatGraph
=
ContributorsStatGraph
;
app/assets/javascripts/lib/chart.js
deleted
100644 → 0
View file @
f77a5e2e
/* eslint-disable func-names, space-before-function-paren */
window
.
Chart
=
require
(
'
vendor/Chart
'
);
app/views/projects/graphs/charts.html.haml
View file @
e9c1e608
-
@no_container
=
true
-
page_title
"Charts"
-
content_for
:page_specific_javascripts
do
=
page_specific_javascript_bundle_tag
(
'lib_chart'
)
=
page_specific_javascript_bundle_tag
(
'graphs'
)
=
render
"projects/commits/head"
...
...
app/views/projects/graphs/show.html.haml
View file @
e9c1e608
-
@no_container
=
true
-
page_title
"Contributors"
-
content_for
:page_specific_javascripts
do
=
page_specific_javascript_bundle_tag
(
'lib_chart'
)
=
page_specific_javascript_bundle_tag
(
'graphs'
)
=
render
'projects/commits/head'
...
...
app/views/projects/pipelines/charts.html.haml
View file @
e9c1e608
-
@no_container
=
true
-
page_title
"Charts"
,
"Pipelines"
-
content_for
:page_specific_javascripts
do
=
page_specific_javascript_bundle_tag
(
'lib_chart'
)
=
page_specific_javascript_bundle_tag
(
'graphs'
)
=
render
'head'
...
...
config/webpack.config.js
View file @
e9c1e608
...
...
@@ -40,7 +40,6 @@ var config = {
snippet
:
'
./snippet/snippet_bundle.js
'
,
terminal
:
'
./terminal/terminal_bundle.js
'
,
users
:
'
./users/users_bundle.js
'
,
lib_chart
:
'
./lib/chart.js
'
,
lib_d3
:
'
./lib/d3.js
'
,
vue_pipelines
:
'
./vue_pipelines_index/index.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