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
96ea697b
Commit
96ea697b
authored
Apr 26, 2017
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[skip ci] fix eslint
parent
83965105
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
6 deletions
+12
-6
app/assets/javascripts/sidebar/components/assignees/assignees.js
...ets/javascripts/sidebar/components/assignees/assignees.js
+4
-2
app/assets/javascripts/sidebar/components/time_tracking/collapsed_state.js
...ripts/sidebar/components/time_tracking/collapsed_state.js
+7
-1
app/assets/javascripts/sidebar/sidebar_mediator.js
app/assets/javascripts/sidebar/sidebar_mediator.js
+1
-3
No files found.
app/assets/javascripts/sidebar/components/assignees/assignees.js
View file @
96ea697b
...
...
@@ -89,8 +89,10 @@ export default {
return
`@
${
user
.
username
}
`
;
},
shouldRenderCollapsedAssignee
(
index
)
{
return
index
===
0
||
this
.
users
.
length
<=
2
&&
index
<=
2
}
const
firstTwo
=
this
.
users
.
length
<=
2
&&
index
<=
2
;
return
index
===
0
||
firstTwo
;
},
},
template
:
`
<div>
...
...
app/assets/javascripts/sidebar/components/time_tracking/collapsed_state.js
View file @
96ea697b
...
...
@@ -49,6 +49,8 @@ export default {
}
else
if
(
this
.
showNoTimeTrackingState
)
{
return
'
no-tracking
'
;
}
return
''
;
},
spanClass
()
{
if
(
this
.
showComparisonState
)
{
...
...
@@ -58,6 +60,8 @@ export default {
}
else
if
(
this
.
showNoTimeTrackingState
)
{
return
'
no-value
'
;
}
return
''
;
},
text
()
{
if
(
this
.
showComparisonState
)
{
...
...
@@ -69,7 +73,9 @@ export default {
}
else
if
(
this
.
showNoTimeTrackingState
)
{
return
'
None
'
;
}
}
return
''
;
},
},
methods
:
{
abbreviateTime
(
timeStr
)
{
...
...
app/assets/javascripts/sidebar/sidebar_mediator.js
View file @
96ea697b
...
...
@@ -44,8 +44,6 @@ export default class SidebarMediator {
this
.
store
.
processUserData
(
data
);
this
.
store
.
processTimeTrackingData
(
data
);
})
.
catch
(()
=>
{
return
new
Flash
(
'
Error occured when fetching sidebar data
'
);
});
.
catch
(()
=>
new
Flash
(
'
Error occured when fetching sidebar data
'
));
}
}
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