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
8d822b1e
Commit
8d822b1e
authored
Dec 14, 2017
by
Jose Ivan Vargas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added minChunks to the common_d3 bundle
parent
38c5baee
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
8 deletions
+4
-8
app/assets/javascripts/graphs/stat_graph_contributors.js
app/assets/javascripts/graphs/stat_graph_contributors.js
+0
-6
app/assets/javascripts/graphs/stat_graph_contributors_graph.js
...ssets/javascripts/graphs/stat_graph_contributors_graph.js
+1
-1
config/webpack.config.js
config/webpack.config.js
+3
-1
No files found.
app/assets/javascripts/graphs/stat_graph_contributors.js
View file @
8d822b1e
/* eslint-disable func-names, space-before-function-paren, wrap-iife, no-var, one-var, camelcase, one-var-declaration-per-line, quotes, no-param-reassign, quote-props, comma-dangle, prefer-template, max-len, no-return-assign, no-shadow */
/* eslint-disable func-names, space-before-function-paren, wrap-iife, no-var, one-var, camelcase, one-var-declaration-per-line, quotes, no-param-reassign, quote-props, comma-dangle, prefer-template, max-len, no-return-assign, no-shadow */
import
_
from
'
underscore
'
;
import
_
from
'
underscore
'
;
<<<<<<<
HEAD
=======
import
{
timeFormat
}
from
'
d3-time-format
'
;
>>>>>>>
Refactored
d3
modules
to
instead
of
having
a
common_d3
dir
,
to
use
the
micro
modules
instead
import
{
ContributorsGraph
,
ContributorsAuthorGraph
,
ContributorsMasterGraph
}
from
'
./stat_graph_contributors_graph
'
;
import
{
ContributorsGraph
,
ContributorsAuthorGraph
,
ContributorsMasterGraph
}
from
'
./stat_graph_contributors_graph
'
;
import
ContributorsStatGraphUtil
from
'
./stat_graph_contributors_util
'
;
import
ContributorsStatGraphUtil
from
'
./stat_graph_contributors_util
'
;
import
{
n__
,
s__
,
createDateTimeFormat
,
sprintf
}
from
'
../locale
'
;
import
{
n__
,
s__
,
createDateTimeFormat
,
sprintf
}
from
'
../locale
'
;
const
d3
=
{
timeFormat
};
export
default
(
function
()
{
export
default
(
function
()
{
function
ContributorsStatGraph
()
{
function
ContributorsStatGraph
()
{
this
.
dateFormat
=
createDateTimeFormat
({
year
:
'
numeric
'
,
month
:
'
long
'
,
day
:
'
numeric
'
});
this
.
dateFormat
=
createDateTimeFormat
({
year
:
'
numeric
'
,
month
:
'
long
'
,
day
:
'
numeric
'
});
...
...
app/assets/javascripts/graphs/stat_graph_contributors_graph.js
View file @
8d822b1e
/* eslint-disable func-names, space-before-function-paren, no-var, prefer-rest-params, max-len, no-restricted-syntax, vars-on-top, no-use-before-define, no-param-reassign, new-cap, no-underscore-dangle, wrap-iife, comma-dangle, no-return-assign, prefer-arrow-callback, quotes, prefer-template, newline-per-chained-call, no-else-return, no-shadow */
/* eslint-disable func-names, space-before-function-paren, no-var, prefer-rest-params, max-len, no-restricted-syntax, vars-on-top, no-use-before-define, no-param-reassign, new-cap, no-underscore-dangle, wrap-iife, comma-dangle, no-return-assign, prefer-arrow-callback, quotes, prefer-template, newline-per-chained-call, no-else-return, no-shadow */
import
_
from
'
underscore
'
;
import
_
from
'
underscore
'
;
import
{
dateTickFormat
}
from
'
../lib/utils/tick_formats
'
;
import
{
extent
,
max
}
from
'
d3-array
'
;
import
{
extent
,
max
}
from
'
d3-array
'
;
import
{
select
,
event
as
d3Event
}
from
'
d3-selection
'
;
import
{
select
,
event
as
d3Event
}
from
'
d3-selection
'
;
import
{
scaleTime
,
scaleLinear
}
from
'
d3-scale
'
;
import
{
scaleTime
,
scaleLinear
}
from
'
d3-scale
'
;
...
@@ -8,6 +7,7 @@ import { axisLeft, axisBottom } from 'd3-axis';
...
@@ -8,6 +7,7 @@ import { axisLeft, axisBottom } from 'd3-axis';
import
{
area
}
from
'
d3-shape
'
;
import
{
area
}
from
'
d3-shape
'
;
import
{
brushX
}
from
'
d3-brush
'
;
import
{
brushX
}
from
'
d3-brush
'
;
import
{
timeParse
}
from
'
d3-time-format
'
;
import
{
timeParse
}
from
'
d3-time-format
'
;
import
{
dateTickFormat
}
from
'
../lib/utils/tick_formats
'
;
const
d3
=
{
extent
,
max
,
select
,
scaleTime
,
scaleLinear
,
axisLeft
,
axisBottom
,
area
,
brushX
,
timeParse
};
const
d3
=
{
extent
,
max
,
select
,
scaleTime
,
scaleLinear
,
axisLeft
,
axisBottom
,
area
,
brushX
,
timeParse
};
...
...
config/webpack.config.js
View file @
8d822b1e
...
@@ -32,7 +32,6 @@ var config = {
...
@@ -32,7 +32,6 @@ var config = {
boards
:
'
./boards/boards_bundle.js
'
,
boards
:
'
./boards/boards_bundle.js
'
,
common
:
'
./commons/index.js
'
,
common
:
'
./commons/index.js
'
,
common_vue
:
'
./vue_shared/vue_resource_interceptor.js
'
,
common_vue
:
'
./vue_shared/vue_resource_interceptor.js
'
,
common_d3
:
[
'
d3-selection
'
,
'
d3-scale
'
,
'
d3-array
'
,
'
d3-time-format
'
,
'
d3-shape
'
,
'
d3-time
'
,
'
d3-axis
'
,
'
d3-brush
'
],
cycle_analytics
:
'
./cycle_analytics/cycle_analytics_bundle.js
'
,
cycle_analytics
:
'
./cycle_analytics/cycle_analytics_bundle.js
'
,
commit_pipelines
:
'
./commit/pipelines/pipelines_bundle.js
'
,
commit_pipelines
:
'
./commit/pipelines/pipelines_bundle.js
'
,
deploy_keys
:
'
./deploy_keys/index.js
'
,
deploy_keys
:
'
./deploy_keys/index.js
'
,
...
@@ -224,6 +223,9 @@ var config = {
...
@@ -224,6 +223,9 @@ var config = {
'
monitoring
'
,
'
monitoring
'
,
'
users
'
,
'
users
'
,
],
],
minChunks
:
function
(
module
,
count
)
{
return
module
.
resource
&&
/d3-/
.
test
(
module
.
resource
);
},
}),
}),
// create cacheable common library bundles
// create cacheable common library bundles
...
...
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