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
d9a3c5f2
Commit
d9a3c5f2
authored
Jul 28, 2017
by
Jose Ivan Vargas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refactored deployment mixins
parent
fdd1d59f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
3 deletions
+2
-3
app/assets/javascripts/monitoring/components/graph.vue
app/assets/javascripts/monitoring/components/graph.vue
+0
-1
app/assets/javascripts/monitoring/mixins/monitoring_mixins.js
...assets/javascripts/monitoring/mixins/monitoring_mixins.js
+2
-2
No files found.
app/assets/javascripts/monitoring/components/graph.vue
View file @
d9a3c5f2
...
@@ -40,7 +40,6 @@
...
@@ -40,7 +40,6 @@
graphWidth
:
600
,
graphWidth
:
600
,
graphHeightOffset
:
120
,
graphHeightOffset
:
120
,
margin
:
{},
margin
:
{},
breakpointHandler
:
Breakpoints
.
get
(),
unitOfDisplay
:
''
,
unitOfDisplay
:
''
,
areaColorRgb
:
'
#8fbce8
'
,
areaColorRgb
:
'
#8fbce8
'
,
lineColorRgb
:
'
#1f78d1
'
,
lineColorRgb
:
'
#1f78d1
'
,
...
...
app/assets/javascripts/monitoring/mixins/monitoring_mixins.js
View file @
d9a3c5f2
...
@@ -21,9 +21,9 @@ const mixins = {
...
@@ -21,9 +21,9 @@ const mixins = {
formatDeployments
()
{
formatDeployments
()
{
this
.
reducedDeploymentData
=
this
.
deploymentData
.
reduce
((
deploymentDataArray
,
deployment
)
=>
{
this
.
reducedDeploymentData
=
this
.
deploymentData
.
reduce
((
deploymentDataArray
,
deployment
)
=>
{
const
time
=
new
Date
(
deployment
.
created_at
);
const
time
=
new
Date
(
deployment
.
created_at
);
const
xPos
=
Math
.
floor
(
this
.
xScale
(
time
));
const
xPos
=
Math
.
floor
(
this
.
timeSeries
[
0
].
timeSeriesScaleX
(
time
));
time
.
setSeconds
(
this
.
data
[
0
].
time
.
getSeconds
());
time
.
setSeconds
(
this
.
timeSeries
[
0
].
values
[
0
].
time
.
getSeconds
());
if
(
xPos
>=
0
)
{
if
(
xPos
>=
0
)
{
deploymentDataArray
.
push
({
deploymentDataArray
.
push
({
...
...
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