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
58b26c0c
Commit
58b26c0c
authored
Sep 27, 2018
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix conflicts within app/assets/javascripts/monitoring/components/dashboard.vue
parent
f98569f2
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
7 deletions
+0
-7
app/assets/javascripts/monitoring/components/dashboard.vue
app/assets/javascripts/monitoring/components/dashboard.vue
+0
-7
No files found.
app/assets/javascripts/monitoring/components/dashboard.vue
View file @
58b26c0c
...
@@ -138,7 +138,6 @@ export default {
...
@@ -138,7 +138,6 @@ export default {
},
},
mounted
()
{
mounted
()
{
this
.
resizeThrottled
=
_
.
debounce
(
this
.
resize
,
100
);
this
.
resizeThrottled
=
_
.
debounce
(
this
.
resize
,
100
);
<<<<<<<
HEAD
this
.
servicePromises
=
[
this
.
servicePromises
=
[
this
.
service
this
.
service
.
getGraphsData
()
.
getGraphsData
()
...
@@ -149,8 +148,6 @@ export default {
...
@@ -149,8 +148,6 @@ export default {
.
then
(
data
=>
this
.
store
.
storeDeploymentData
(
data
))
.
then
(
data
=>
this
.
store
.
storeDeploymentData
(
data
))
.
catch
(()
=>
Flash
(
s__
(
'
Metrics|There was an error getting deployment information.
'
))),
.
catch
(()
=>
Flash
(
s__
(
'
Metrics|There was an error getting deployment information.
'
))),
];
];
=======
>>>>>>>
upstream
/
master
if
(
!
this
.
hasMetrics
)
{
if
(
!
this
.
hasMetrics
)
{
this
.
state
=
'
gettingStarted
'
;
this
.
state
=
'
gettingStarted
'
;
}
else
{
}
else
{
...
@@ -198,11 +195,7 @@ export default {
...
@@ -198,11 +195,7 @@ export default {
<
template
>
<
template
>
<div
<div
v-if=
"!showEmptyState"
v-if=
"!showEmptyState"
<<<<<<<
HEAD
:key=
"updateDashboardKey"
=======
:key=
"forceRedraw"
:key=
"forceRedraw"
>
>>>>>> upstream/master
class=
"prometheus-graphs prepend-top-default"
class=
"prometheus-graphs prepend-top-default"
>
>
<div
<div
...
...
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