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
a3f8074a
Commit
a3f8074a
authored
Mar 12, 2020
by
sstern
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace underscore with lodash
parent
52d8ed21
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
8 deletions
+5
-8
ee/app/assets/javascripts/operations/components/dashboard/dashboard.vue
...javascripts/operations/components/dashboard/dashboard.vue
+1
-2
ee/app/assets/javascripts/operations/components/dashboard/project.vue
...s/javascripts/operations/components/dashboard/project.vue
+4
-6
No files found.
ee/app/assets/javascripts/operations/components/dashboard/dashboard.vue
View file @
a3f8074a
<
script
>
<
script
>
import
_
from
'
underscore
'
;
import
{
mapState
,
mapActions
}
from
'
vuex
'
;
import
{
mapState
,
mapActions
}
from
'
vuex
'
;
import
{
GlModal
,
GlModalDirective
,
GlButton
,
GlDashboardSkeleton
}
from
'
@gitlab/ui
'
;
import
{
GlModal
,
GlModalDirective
,
GlButton
,
GlDashboardSkeleton
}
from
'
@gitlab/ui
'
;
import
VueDraggable
from
'
vuedraggable
'
;
import
VueDraggable
from
'
vuedraggable
'
;
...
@@ -58,7 +57,7 @@ export default {
...
@@ -58,7 +57,7 @@ export default {
return
this
.
searchCount
>
0
;
return
this
.
searchCount
>
0
;
},
},
okDisabled
()
{
okDisabled
()
{
return
_
.
isEmpty
(
this
.
selectedProjects
)
;
return
Object
.
keys
(
this
.
selectedProjects
).
length
===
0
;
},
},
},
},
created
()
{
created
()
{
...
...
ee/app/assets/javascripts/operations/components/dashboard/project.vue
View file @
a3f8074a
<
script
>
<
script
>
import
{
isEmpty
}
from
'
lodash
'
;
import
{
mapActions
}
from
'
vuex
'
;
import
{
mapActions
}
from
'
vuex
'
;
import
_
from
'
underscore
'
;
import
Alerts
from
'
ee/vue_shared/dashboards/components/alerts.vue
'
;
import
Alerts
from
'
ee/vue_shared/dashboards/components/alerts.vue
'
;
import
TimeAgo
from
'
ee/vue_shared/dashboards/components/time_ago.vue
'
;
import
TimeAgo
from
'
ee/vue_shared/dashboards/components/time_ago.vue
'
;
import
ProjectPipeline
from
'
ee/vue_shared/dashboards/components/project_pipeline.vue
'
;
import
ProjectPipeline
from
'
ee/vue_shared/dashboards/components/project_pipeline.vue
'
;
...
@@ -76,15 +76,13 @@ export default {
...
@@ -76,15 +76,13 @@ export default {
return
__
(
'
The branch for this project has no active pipeline configuration.
'
);
return
__
(
'
The branch for this project has no active pipeline configuration.
'
);
},
},
user
()
{
user
()
{
return
this
.
lastPipeline
&&
!
_
.
isEmpty
(
this
.
lastPipeline
.
user
)
return
this
.
lastPipeline
&&
!
isEmpty
(
this
.
lastPipeline
.
user
)
?
this
.
lastPipeline
.
user
:
null
;
?
this
.
lastPipeline
.
user
:
null
;
},
},
lastPipeline
()
{
lastPipeline
()
{
return
!
_
.
isEmpty
(
this
.
project
.
last_pipeline
)
?
this
.
project
.
last_pipeline
:
null
;
return
!
isEmpty
(
this
.
project
.
last_pipeline
)
?
this
.
project
.
last_pipeline
:
null
;
},
},
commitRef
()
{
commitRef
()
{
return
this
.
lastPipeline
&&
!
_
.
isEmpty
(
this
.
lastPipeline
.
ref
)
return
this
.
lastPipeline
&&
!
isEmpty
(
this
.
lastPipeline
.
ref
)
?
{
?
{
...
this
.
lastPipeline
.
ref
,
...
this
.
lastPipeline
.
ref
,
ref_url
:
this
.
lastPipeline
.
ref
.
path
,
ref_url
:
this
.
lastPipeline
.
ref
.
path
,
...
...
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