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
Boxiang Sun
gitlab-ce
Commits
7e3405d7
Commit
7e3405d7
authored
Jan 08, 2018
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix last eslint rules
parent
349d0668
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
169 additions
and
156 deletions
+169
-156
.eslintrc
.eslintrc
+2
-1
app/assets/javascripts/commit/image_file.js
app/assets/javascripts/commit/image_file.js
+98
-96
app/assets/javascripts/groups/components/item_actions.vue
app/assets/javascripts/groups/components/item_actions.vue
+45
-45
app/assets/javascripts/notebook/cells/output/index.vue
app/assets/javascripts/notebook/cells/output/index.vue
+13
-12
app/assets/javascripts/notes/components/comment_form.vue
app/assets/javascripts/notes/components/comment_form.vue
+2
-1
app/assets/javascripts/vue_shared/components/modal.vue
app/assets/javascripts/vue_shared/components/modal.vue
+1
-1
app/assets/javascripts/vue_shared/components/pikaday.vue
app/assets/javascripts/vue_shared/components/pikaday.vue
+3
-0
app/assets/javascripts/vue_shared/components/sidebar/collapsed_grouped_date_picker.vue
...ared/components/sidebar/collapsed_grouped_date_picker.vue
+2
-0
app/assets/javascripts/vue_shared/components/sidebar/date_picker.vue
...javascripts/vue_shared/components/sidebar/date_picker.vue
+3
-0
No files found.
.eslintrc
View file @
7e3405d7
...
...
@@ -16,7 +16,8 @@
"localStorage": false
},
"parserOptions": {
"parser": "babel-eslint"
"parser": "babel-eslint",
"ecmaVersion": 2017
},
"plugins": [
"filenames",
...
...
app/assets/javascripts/commit/image_file.js
View file @
7e3405d7
...
...
@@ -94,8 +94,9 @@ export default class ImageFile {
});
return
[
maxWidth
,
maxHeight
];
}
views
=
{
// eslint-disable-next-line class-methods-use-this
views
()
{
return
{
'
two-up
'
:
function
()
{
return
$
(
'
.two-up.view .wrap
'
,
this
.
file
).
each
((
function
(
_this
)
{
return
function
(
index
,
wrap
)
{
...
...
@@ -190,6 +191,7 @@ export default class ImageFile {
};
})(
this
));
}
};
}
requestImageInfo
(
img
,
callback
)
{
...
...
app/assets/javascripts/groups/components/item_actions.vue
View file @
7e3405d7
<
script
>
import
{
s__
}
from
'
~/locale
'
;
import
tooltip
from
'
~/vue_shared/directives/tooltip
'
;
import
icon
from
'
~/vue_shared/components/icon.vue
'
;
import
modal
from
'
~/vue_shared/components/modal.vue
'
;
import
eventHub
from
'
../event_hub
'
;
import
{
COMMON_STR
}
from
'
../constants
'
;
import
{
s__
}
from
'
~/locale
'
;
import
tooltip
from
'
~/vue_shared/directives/tooltip
'
;
import
icon
from
'
~/vue_shared/components/icon.vue
'
;
import
modal
from
'
~/vue_shared/components/modal.vue
'
;
import
eventHub
from
'
../event_hub
'
;
import
{
COMMON_STR
}
from
'
../constants
'
;
export
default
{
export
default
{
components
:
{
icon
,
modal
,
...
...
@@ -50,7 +50,7 @@ export default {
eventHub
.
$emit
(
'
leaveGroup
'
,
this
.
group
,
this
.
parentGroup
);
},
},
};
};
</
script
>
<
template
>
...
...
app/assets/javascripts/notebook/cells/output/index.vue
View file @
7e3405d7
...
...
@@ -26,30 +26,18 @@
default
:
()
=>
({}),
},
},
data
()
{
return
{
outputType
:
''
,
};
},
computed
:
{
componentName
()
{
if
(
this
.
output
.
text
)
{
return
'
code-cell
'
;
}
else
if
(
this
.
output
.
data
[
'
image/png
'
])
{
this
.
outputType
=
'
image/png
'
;
return
'
image-output
'
;
}
else
if
(
this
.
output
.
data
[
'
text/html
'
])
{
this
.
outputType
=
'
text/html
'
;
return
'
html-output
'
;
}
else
if
(
this
.
output
.
data
[
'
image/svg+xml
'
])
{
this
.
outputType
=
'
image/svg+xml
'
;
return
'
html-output
'
;
}
this
.
outputType
=
'
text/plain
'
;
return
'
code-cell
'
;
},
rawCode
()
{
...
...
@@ -59,6 +47,19 @@
return
this
.
dataForType
(
this
.
outputType
);
},
outputType
()
{
if
(
this
.
output
.
text
)
{
return
''
;
}
else
if
(
this
.
output
.
data
[
'
image/png
'
])
{
return
'
image/png
'
;
}
else
if
(
this
.
output
.
data
[
'
text/html
'
])
{
return
'
text/html
'
;
}
else
if
(
this
.
output
.
data
[
'
image/svg+xml
'
])
{
return
'
image/svg+xml
'
;
}
return
'
text/plain
'
;
},
},
methods
:
{
dataForType
(
type
)
{
...
...
app/assets/javascripts/notes/components/comment_form.vue
View file @
7e3405d7
...
...
@@ -305,7 +305,8 @@ js-gfm-input js-autosize markdown-area js-vue-textarea"
</textarea>
</markdown-field>
<div
class=
"note-form-actions"
>
<div
class=
"pull-left btn-group
<div
class=
"pull-left btn-group
append-right-10 comment-type-dropdown js-comment-type-dropdown droplab-dropdown"
>
<button
@
click.prevent=
"handleSave()"
...
...
app/assets/javascripts/vue_shared/components/modal.vue
View file @
7e3405d7
...
...
@@ -115,7 +115,7 @@
name=
"body"
:text=
"text"
>
<p>
{{
t
his
.
t
ext
}}
</p>
<p>
{{
text
}}
</p>
</slot>
</div>
<div
...
...
app/assets/javascripts/vue_shared/components/pikaday.vue
View file @
7e3405d7
...
...
@@ -13,14 +13,17 @@
selectedDate
:
{
type
:
Date
,
required
:
false
,
default
:
null
,
},
minDate
:
{
type
:
Date
,
required
:
false
,
default
:
null
,
},
maxDate
:
{
type
:
Date
,
required
:
false
,
default
:
null
,
},
},
mounted
()
{
...
...
app/assets/javascripts/vue_shared/components/sidebar/collapsed_grouped_date_picker.vue
View file @
7e3405d7
...
...
@@ -23,10 +23,12 @@
minDate
:
{
type
:
Date
,
required
:
false
,
default
:
null
,
},
maxDate
:
{
type
:
Date
,
required
:
false
,
default
:
null
,
},
disableClickableIcons
:
{
type
:
Boolean
,
...
...
app/assets/javascripts/vue_shared/components/sidebar/date_picker.vue
View file @
7e3405d7
...
...
@@ -42,14 +42,17 @@
selectedDate
:
{
type
:
Date
,
required
:
false
,
default
:
null
,
},
minDate
:
{
type
:
Date
,
required
:
false
,
default
:
null
,
},
maxDate
:
{
type
:
Date
,
required
:
false
,
default
:
null
,
},
},
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