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
088de723
Commit
088de723
authored
Jan 05, 2018
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[ci skip] Fix more eslint rules
parent
7c7f5266
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
380 additions
and
380 deletions
+380
-380
app/assets/javascripts/ide/components/repo_preview.vue
app/assets/javascripts/ide/components/repo_preview.vue
+62
-56
app/assets/javascripts/ide/components/repo_tab.vue
app/assets/javascripts/ide/components/repo_tab.vue
+34
-37
app/assets/javascripts/issue_show/components/app.vue
app/assets/javascripts/issue_show/components/app.vue
+281
-283
app/assets/javascripts/issue_show/components/fields/description.vue
.../javascripts/issue_show/components/fields/description.vue
+1
-1
app/assets/javascripts/issue_show/components/title.vue
app/assets/javascripts/issue_show/components/title.vue
+1
-1
app/assets/javascripts/jobs/components/header.vue
app/assets/javascripts/jobs/components/header.vue
+1
-1
app/assets/javascripts/monitoring/components/graph.vue
app/assets/javascripts/monitoring/components/graph.vue
+0
-1
No files found.
app/assets/javascripts/ide/components/repo_preview.vue
View file @
088de723
<
script
>
<
script
>
import
{
mapGetters
}
from
'
vuex
'
;
import
{
mapGetters
}
from
'
vuex
'
;
import
LineHighlighter
from
'
../../line_highlighter
'
;
import
LineHighlighter
from
'
../../line_highlighter
'
;
import
syntaxHighlight
from
'
../../syntax_highlight
'
;
import
syntaxHighlight
from
'
../../syntax_highlight
'
;
export
default
{
export
default
{
computed
:
{
computed
:
{
...
mapGetters
([
...
mapGetters
([
'
activeFile
'
,
'
activeFile
'
,
...
@@ -12,11 +12,6 @@ export default {
...
@@ -12,11 +12,6 @@ export default {
return
this
.
activeFile
.
renderError
===
'
too_large
'
;
return
this
.
activeFile
.
renderError
===
'
too_large
'
;
},
},
},
},
methods
:
{
highlightFile
()
{
syntaxHighlight
(
$
(
this
.
$el
).
find
(
'
.file-content
'
));
},
},
mounted
()
{
mounted
()
{
this
.
highlightFile
();
this
.
highlightFile
();
this
.
lineHighlighter
=
new
LineHighlighter
({
this
.
lineHighlighter
=
new
LineHighlighter
({
...
@@ -29,11 +24,16 @@ export default {
...
@@ -29,11 +24,16 @@ export default {
this
.
highlightFile
();
this
.
highlightFile
();
});
});
},
},
};
methods
:
{
highlightFile
()
{
syntaxHighlight
(
$
(
this
.
$el
).
find
(
'
.file-content
'
));
},
},
};
</
script
>
</
script
>
<
template
>
<
template
>
<div>
<div>
<div
<div
v-if=
"!activeFile.renderError"
v-if=
"!activeFile.renderError"
v-html=
"activeFile.html"
v-html=
"activeFile.html"
...
@@ -51,15 +51,21 @@ export default {
...
@@ -51,15 +51,21 @@ export default {
v-else-if=
"renderErrorTooLarge"
v-else-if=
"renderErrorTooLarge"
class=
"vertical-center render-error"
>
class=
"vertical-center render-error"
>
<p
class=
"text-center"
>
<p
class=
"text-center"
>
The source could not be displayed because it is too large. You can
<a
:href=
"activeFile.rawPath"
download
>
download
</a>
it instead.
The source could not be displayed because it is too large.
You can
<a
:href=
"activeFile.rawPath"
download
>
download
</a>
it instead.
</p>
</p>
</div>
</div>
<div
<div
v-else
v-else
class=
"vertical-center render-error"
>
class=
"vertical-center render-error"
>
<p
class=
"text-center"
>
<p
class=
"text-center"
>
The source could not be displayed because a rendering error occurred. You can
<a
:href=
"activeFile.rawPath"
download
>
download
</a>
it instead.
The source could not be displayed because a rendering error occurred.
You can
<a
:href=
"activeFile.rawPath"
download
>
download
</a>
it instead.
</p>
</p>
</div>
</div>
</div>
</div>
</
template
>
</
template
>
app/assets/javascripts/ide/components/repo_tab.vue
View file @
088de723
<
script
>
<
script
>
import
{
mapActions
}
from
'
vuex
'
;
import
{
mapActions
}
from
'
vuex
'
;
import
fileIcon
from
'
../../vue_shared/components/file_icon.vue
'
;
import
fileIcon
from
'
../../vue_shared/components/file_icon.vue
'
;
export
default
{
export
default
{
components
:
{
fileIcon
,
},
props
:
{
props
:
{
tab
:
{
tab
:
{
type
:
Object
,
type
:
Object
,
required
:
true
,
required
:
true
,
},
},
},
},
components
:
{
fileIcon
,
},
computed
:
{
computed
:
{
closeLabel
()
{
closeLabel
()
{
if
(
this
.
tab
.
changed
||
this
.
tab
.
tempFile
)
{
if
(
this
.
tab
.
changed
||
this
.
tab
.
tempFile
)
{
...
@@ -36,13 +36,11 @@ export default {
...
@@ -36,13 +36,11 @@ export default {
this
.
$router
.
push
(
`/project
${
tab
.
url
}
`
);
this
.
$router
.
push
(
`/project
${
tab
.
url
}
`
);
},
},
},
},
};
};
</
script
>
</
script
>
<
template
>
<
template
>
<li
<li
@
click=
"clickFile(tab)"
>
@
click=
"clickFile(tab)"
>
<button
<button
type=
"button"
type=
"button"
class=
"multi-file-tab-close"
class=
"multi-file-tab-close"
...
@@ -69,8 +67,7 @@ export default {
...
@@ -69,8 +67,7 @@ export default {
<file-icon
<file-icon
:file-name=
"tab.name"
:file-name=
"tab.name"
:size=
"16"
:size=
"16"
>
/>
</file-icon>
{{
tab
.
name
}}
{{
tab
.
name
}}
</div>
</div>
</li>
</li>
...
...
app/assets/javascripts/issue_show/components/app.vue
View file @
088de723
<
script
>
<
script
>
import
Visibility
from
'
visibilityjs
'
;
import
Visibility
from
'
visibilityjs
'
;
import
{
visitUrl
}
from
'
../../lib/utils/url_utility
'
;
import
{
visitUrl
}
from
'
../../lib/utils/url_utility
'
;
import
Poll
from
'
../../lib/utils/poll
'
;
import
Poll
from
'
../../lib/utils/poll
'
;
import
eventHub
from
'
../event_hub
'
;
import
eventHub
from
'
../event_hub
'
;
import
Service
from
'
../services/index
'
;
import
Service
from
'
../services/index
'
;
import
Store
from
'
../stores
'
;
import
Store
from
'
../stores
'
;
import
titleComponent
from
'
./title.vue
'
;
import
titleComponent
from
'
./title.vue
'
;
import
descriptionComponent
from
'
./description.vue
'
;
import
descriptionComponent
from
'
./description.vue
'
;
import
editedComponent
from
'
./edited.vue
'
;
import
editedComponent
from
'
./edited.vue
'
;
import
formComponent
from
'
./form.vue
'
;
import
formComponent
from
'
./form.vue
'
;
import
recaptchaModalImplementor
from
'
../../vue_shared/mixins/recaptcha_modal_implementor
'
;
import
recaptchaModalImplementor
from
'
../../vue_shared/mixins/recaptcha_modal_implementor
'
;
export
default
{
export
default
{
components
:
{
descriptionComponent
,
titleComponent
,
editedComponent
,
formComponent
,
},
mixins
:
[
recaptchaModalImplementor
,
],
props
:
{
props
:
{
endpoint
:
{
endpoint
:
{
required
:
true
,
required
:
true
,
...
@@ -144,17 +153,40 @@ export default {
...
@@ -144,17 +153,40 @@ export default {
return
!!
this
.
state
.
updatedAt
;
return
!!
this
.
state
.
updatedAt
;
},
},
},
},
components
:
{
created
()
{
descriptionComponent
,
this
.
service
=
new
Service
(
this
.
endpoint
);
titleComponent
,
this
.
poll
=
new
Poll
({
editedComponent
,
resource
:
this
.
service
,
formComponent
,
method
:
'
getData
'
,
successCallback
:
res
=>
this
.
store
.
updateState
(
res
.
data
),
errorCallback
(
err
)
{
throw
new
Error
(
err
);
},
},
});
mixins
:
[
if
(
!
Visibility
.
hidden
())
{
recaptchaModalImplementor
,
this
.
poll
.
makeRequest
();
],
}
Visibility
.
change
(()
=>
{
if
(
!
Visibility
.
hidden
())
{
this
.
poll
.
restart
();
}
else
{
this
.
poll
.
stop
();
}
});
eventHub
.
$on
(
'
delete.issuable
'
,
this
.
deleteIssuable
);
eventHub
.
$on
(
'
update.issuable
'
,
this
.
updateIssuable
);
eventHub
.
$on
(
'
close.form
'
,
this
.
closeForm
);
eventHub
.
$on
(
'
open.form
'
,
this
.
openForm
);
},
beforeDestroy
()
{
eventHub
.
$off
(
'
delete.issuable
'
,
this
.
deleteIssuable
);
eventHub
.
$off
(
'
update.issuable
'
,
this
.
updateIssuable
);
eventHub
.
$off
(
'
close.form
'
,
this
.
closeForm
);
eventHub
.
$off
(
'
open.form
'
,
this
.
openForm
);
},
methods
:
{
methods
:
{
openForm
()
{
openForm
()
{
if
(
!
this
.
showForm
)
{
if
(
!
this
.
showForm
)
{
...
@@ -220,45 +252,11 @@ export default {
...
@@ -220,45 +252,11 @@ export default {
});
});
},
},
},
},
created
()
{
};
this
.
service
=
new
Service
(
this
.
endpoint
);
this
.
poll
=
new
Poll
({
resource
:
this
.
service
,
method
:
'
getData
'
,
successCallback
:
res
=>
this
.
store
.
updateState
(
res
.
data
),
errorCallback
(
err
)
{
throw
new
Error
(
err
);
},
});
if
(
!
Visibility
.
hidden
())
{
this
.
poll
.
makeRequest
();
}
Visibility
.
change
(()
=>
{
if
(
!
Visibility
.
hidden
())
{
this
.
poll
.
restart
();
}
else
{
this
.
poll
.
stop
();
}
});
eventHub
.
$on
(
'
delete.issuable
'
,
this
.
deleteIssuable
);
eventHub
.
$on
(
'
update.issuable
'
,
this
.
updateIssuable
);
eventHub
.
$on
(
'
close.form
'
,
this
.
closeForm
);
eventHub
.
$on
(
'
open.form
'
,
this
.
openForm
);
},
beforeDestroy
()
{
eventHub
.
$off
(
'
delete.issuable
'
,
this
.
deleteIssuable
);
eventHub
.
$off
(
'
update.issuable
'
,
this
.
updateIssuable
);
eventHub
.
$off
(
'
close.form
'
,
this
.
closeForm
);
eventHub
.
$off
(
'
open.form
'
,
this
.
openForm
);
},
};
</
script
>
</
script
>
<
template
>
<
template
>
<div>
<div>
<div
v-if=
"canUpdate && showForm"
>
<div
v-if=
"canUpdate && showForm"
>
<form-component
<form-component
:form-state=
"formState"
:form-state=
"formState"
...
@@ -304,5 +302,5 @@ export default {
...
@@ -304,5 +302,5 @@ export default {
:updated-by-path=
"state.updatedByPath"
:updated-by-path=
"state.updatedByPath"
/>
/>
</div>
</div>
</div>
</div>
</
template
>
</
template
>
app/assets/javascripts/issue_show/components/fields/description.vue
View file @
088de723
...
@@ -3,10 +3,10 @@
...
@@ -3,10 +3,10 @@
import
markdownField
from
'
../../../vue_shared/components/markdown/field.vue
'
;
import
markdownField
from
'
../../../vue_shared/components/markdown/field.vue
'
;
export
default
{
export
default
{
mixins
:
[
updateMixin
],
components
:
{
components
:
{
markdownField
,
markdownField
,
},
},
mixins
:
[
updateMixin
],
props
:
{
props
:
{
formState
:
{
formState
:
{
type
:
Object
,
type
:
Object
,
...
...
app/assets/javascripts/issue_show/components/title.vue
View file @
088de723
...
@@ -5,10 +5,10 @@
...
@@ -5,10 +5,10 @@
import
{
spriteIcon
}
from
'
../../lib/utils/common_utils
'
;
import
{
spriteIcon
}
from
'
../../lib/utils/common_utils
'
;
export
default
{
export
default
{
mixins
:
[
animateMixin
],
directives
:
{
directives
:
{
tooltip
,
tooltip
,
},
},
mixins
:
[
animateMixin
],
props
:
{
props
:
{
issuableRef
:
{
issuableRef
:
{
type
:
String
,
type
:
String
,
...
...
app/assets/javascripts/jobs/components/header.vue
View file @
088de723
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
import
loadingIcon
from
'
../../vue_shared/components/loading_icon.vue
'
;
import
loadingIcon
from
'
../../vue_shared/components/loading_icon.vue
'
;
export
default
{
export
default
{
name
:
'
j
obHeaderSection
'
,
name
:
'
J
obHeaderSection
'
,
components
:
{
components
:
{
ciHeader
,
ciHeader
,
loadingIcon
,
loadingIcon
,
...
...
app/assets/javascripts/monitoring/components/graph.vue
View file @
088de723
...
@@ -26,7 +26,6 @@
...
@@ -26,7 +26,6 @@
mixins
:
[
MonitoringMixin
],
mixins
:
[
MonitoringMixin
],
props
:
{
props
:
{
graphData
:
{
graphData
:
{
type
:
Object
,
type
:
Object
,
...
...
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