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
e29c0da8
Commit
e29c0da8
authored
Jun 13, 2018
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updates eslint rules
parent
26137130
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
23 additions
and
23 deletions
+23
-23
app/assets/javascripts/ide/components/commit_sidebar/list_item.vue
...s/javascripts/ide/components/commit_sidebar/list_item.vue
+1
-1
app/assets/javascripts/ide/components/repo_commit_section.vue
...assets/javascripts/ide/components/repo_commit_section.vue
+2
-2
app/assets/javascripts/vue_shared/components/diff_viewer/diff_viewer.vue
...scripts/vue_shared/components/diff_viewer/diff_viewer.vue
+2
-2
app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff/onion_skin_viewer.vue
...ents/diff_viewer/viewers/image_diff/onion_skin_viewer.vue
+9
-9
app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff/swipe_viewer.vue
...omponents/diff_viewer/viewers/image_diff/swipe_viewer.vue
+7
-7
app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff_viewer.vue
...ared/components/diff_viewer/viewers/image_diff_viewer.vue
+2
-2
No files found.
app/assets/javascripts/ide/components/commit_sidebar/list_item.vue
View file @
e29c0da8
...
@@ -82,10 +82,10 @@ export default {
...
@@ -82,10 +82,10 @@ export default {
<
template
>
<
template
>
<div
<div
class=
"multi-file-commit-list-item"
:class=
"
{
:class=
"
{
'is-active': isActive
'is-active': isActive
}"
}"
class="multi-file-commit-list-item"
>
>
<button
<button
type=
"button"
type=
"button"
...
...
app/assets/javascripts/ide/components/repo_commit_section.vue
View file @
e29c0da8
...
@@ -94,11 +94,11 @@ export default {
...
@@ -94,11 +94,11 @@ export default {
:key-prefix=
"$options.stageKeys.unstaged"
:key-prefix=
"$options.stageKeys.unstaged"
:file-list=
"changedFiles"
:file-list=
"changedFiles"
:action-btn-text=
"__('Stage all')"
:action-btn-text=
"__('Stage all')"
:active-file-key=
"activeFileKey"
class=
"is-first"
class=
"is-first"
icon-name=
"unstaged"
icon-name=
"unstaged"
action=
"stageAllChanges"
action=
"stageAllChanges"
item-action-component=
"stage-button"
item-action-component=
"stage-button"
:active-file-key=
"activeFileKey"
/>
/>
<commit-files-list
<commit-files-list
:title=
"__('Staged')"
:title=
"__('Staged')"
...
@@ -106,10 +106,10 @@ export default {
...
@@ -106,10 +106,10 @@ export default {
:file-list=
"stagedFiles"
:file-list=
"stagedFiles"
:action-btn-text=
"__('Unstage all')"
:action-btn-text=
"__('Unstage all')"
:staged-list=
"true"
:staged-list=
"true"
:active-file-key=
"activeFileKey"
icon-name=
"staged"
icon-name=
"staged"
action=
"unstageAllChanges"
action=
"unstageAllChanges"
item-action-component=
"unstage-button"
item-action-component=
"unstage-button"
:active-file-key=
"activeFileKey"
/>
/>
</
template
>
</
template
>
<empty-state
<empty-state
...
...
app/assets/javascripts/vue_shared/components/diff_viewer/diff_viewer.vue
View file @
e29c0da8
...
@@ -57,8 +57,8 @@ export default {
...
@@ -57,8 +57,8 @@ export default {
<
template
>
<
template
>
<div
<div
class=
"diff-file preview-contain
er"
v-if=
"view
er"
v-if=
"view
er"
>
class=
"diff-file preview-contain
er"
>
<component
<component
:is=
"viewer"
:is=
"viewer"
:diff-mode=
"diffMode"
:diff-mode=
"diffMode"
...
...
app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff/onion_skin_viewer.vue
View file @
e29c0da8
...
@@ -104,18 +104,18 @@ export default {
...
@@ -104,18 +104,18 @@ export default {
<
template
>
<
template
>
<div
class=
"onion-skin view"
>
<div
class=
"onion-skin view"
>
<div
<div
class=
"onion-skin-frame"
:style=
"
{
:style=
"
{
'width': onionMaxPixelWidth,
'width': onionMaxPixelWidth,
'height': onionMaxPixelHeight,
'height': onionMaxPixelHeight,
'user-select': dragging === true ? 'none' : '',
'user-select': dragging === true ? 'none' : '',
}">
}"
class="onion-skin-frame">
<div
<div
class=
"frame deleted"
:style=
"
{
:style=
"
{
'width': onionMaxPixelWidth,
'width': onionMaxPixelWidth,
'height': onionMaxPixelHeight,
'height': onionMaxPixelHeight,
}">
}"
class="frame deleted">
<image-viewer
<image-viewer
key=
"onionOldImg"
key=
"onionOldImg"
:render-info=
"false"
:render-info=
"false"
...
@@ -125,13 +125,13 @@ export default {
...
@@ -125,13 +125,13 @@ export default {
/>
/>
</div>
</div>
<div
<div
class=
"added frame"
ref=
"addedFrame"
ref=
"addedFrame"
:style=
"
{
:style=
"
{
'opacity': onionOpacity,
'opacity': onionOpacity,
'width': onionMaxPixelWidth,
'width': onionMaxPixelWidth,
'height': onionMaxPixelHeight,
'height': onionMaxPixelHeight,
}">
}"
class="added frame">
<image-viewer
<image-viewer
key=
"onionNewImg"
key=
"onionNewImg"
:render-info=
"false"
:render-info=
"false"
...
@@ -143,14 +143,14 @@ export default {
...
@@ -143,14 +143,14 @@ export default {
<div
class=
"controls"
>
<div
class=
"controls"
>
<div
class=
"transparent"
></div>
<div
class=
"transparent"
></div>
<div
<div
class=
"drag-track"
ref=
"dragTrack"
ref=
"dragTrack"
class=
"drag-track"
@
mousedown=
"startDrag"
@
mousedown=
"startDrag"
@
mouseup=
"stopDrag"
>
@
mouseup=
"stopDrag"
>
<div
<div
class=
"dragger"
ref=
"dragger"
ref=
"dragger"
:style=
"
{ 'left': onionDraggerPixelPos }">
:style=
"
{ 'left': onionDraggerPixelPos }"
class="dragger">
</div>
</div>
</div>
</div>
<div
class=
"opaque"
></div>
<div
class=
"opaque"
></div>
...
...
app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff/swipe_viewer.vue
View file @
e29c0da8
...
@@ -111,12 +111,12 @@ export default {
...
@@ -111,12 +111,12 @@ export default {
<
template
>
<
template
>
<div
class=
"swipe view"
>
<div
class=
"swipe view"
>
<div
<div
class=
"swipe-frame"
ref=
"swipeFrame"
ref=
"swipeFrame"
:style=
"
{
:style=
"
{
'width': swipeMaxPixelWidth,
'width': swipeMaxPixelWidth,
'height': swipeMaxPixelHeight,
'height': swipeMaxPixelHeight,
}">
}"
class="swipe-frame">
<div
class=
"frame deleted"
>
<div
class=
"frame deleted"
>
<image-viewer
<image-viewer
key=
"swipeOldImg"
key=
"swipeOldImg"
...
@@ -128,12 +128,12 @@ export default {
...
@@ -128,12 +128,12 @@ export default {
/>
/>
</div>
</div>
<div
<div
class=
"swipe-wrap"
ref=
"swipeWrap"
ref=
"swipeWrap"
:style=
"
{
:style=
"
{
'width': swipeWrapPixelWidth,
'width': swipeWrapPixelWidth,
'height': swipeMaxPixelHeight,
'height': swipeMaxPixelHeight,
}">
}"
class="swipe-wrap">
<div
class=
"frame added"
>
<div
class=
"frame added"
>
<image-viewer
<image-viewer
key=
"swipeNewImg"
key=
"swipeNewImg"
...
@@ -145,11 +145,11 @@ export default {
...
@@ -145,11 +145,11 @@ export default {
</div>
</div>
</div>
</div>
<span
<span
class=
"swipe-bar"
ref=
"swipeBar"
ref=
"swipeBar"
:style=
"
{ 'left': swipeBarPixelPos }"
class="swipe-bar"
@mousedown="startDrag"
@mousedown="startDrag"
@
mouseup=
"stopDrag"
@mouseup="stopDrag">
:style=
"
{ 'left': swipeBarPixelPos }">
<span
class=
"top-handle"
></span>
<span
class=
"top-handle"
></span>
<span
class=
"bottom-handle"
></span>
<span
class=
"bottom-handle"
></span>
</span>
</span>
...
...
app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff_viewer.vue
View file @
e29c0da8
...
@@ -49,8 +49,8 @@ export default {
...
@@ -49,8 +49,8 @@ export default {
<
template
>
<
template
>
<div
class=
"diff-file-container"
>
<div
class=
"diff-file-container"
>
<div
<div
class=
"diff-viewer
"
v-if=
"diffMode === $options.diffModes.replaced
"
v-if=
"diffMode === $options.diffModes.replaced
"
>
class=
"diff-viewer
"
>
<div
class=
"image js-replaced-image"
>
<div
class=
"image js-replaced-image"
>
<two-up-viewer
<two-up-viewer
v-if=
"mode === $options.imageViewMode.twoup"
v-if=
"mode === $options.imageViewMode.twoup"
...
...
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