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
fa6ad5d6
Commit
fa6ad5d6
authored
Dec 03, 2020
by
Thomas Randolph
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move the diff_file utility into the utils folder
parent
780e7fd5
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
7 additions
and
7 deletions
+7
-7
app/assets/javascripts/diffs/components/diff_file.vue
app/assets/javascripts/diffs/components/diff_file.vue
+1
-1
app/assets/javascripts/diffs/components/diff_file_header.vue
app/assets/javascripts/diffs/components/diff_file_header.vue
+1
-1
app/assets/javascripts/diffs/store/actions.js
app/assets/javascripts/diffs/store/actions.js
+1
-1
app/assets/javascripts/diffs/store/utils.js
app/assets/javascripts/diffs/store/utils.js
+1
-1
app/assets/javascripts/diffs/utils/diff_file.js
app/assets/javascripts/diffs/utils/diff_file.js
+1
-1
app/assets/javascripts/notes/components/diff_with_note.vue
app/assets/javascripts/notes/components/diff_with_note.vue
+1
-1
spec/frontend/diffs/utils/diff_file_spec.js
spec/frontend/diffs/utils/diff_file_spec.js
+1
-1
No files found.
app/assets/javascripts/diffs/components/diff_file.vue
View file @
fa6ad5d6
...
...
@@ -10,7 +10,7 @@ import notesEventHub from '../../notes/event_hub';
import
DiffFileHeader
from
'
./diff_file_header.vue
'
;
import
DiffContent
from
'
./diff_content.vue
'
;
import
{
diffViewerErrors
}
from
'
~/ide/constants
'
;
import
{
collapsedType
,
isCollapsed
}
from
'
../diff_file
'
;
import
{
collapsedType
,
isCollapsed
}
from
'
../
utils/
diff_file
'
;
import
{
DIFF_FILE_AUTOMATIC_COLLAPSE
,
DIFF_FILE_MANUAL_COLLAPSE
,
...
...
app/assets/javascripts/diffs/components/diff_file_header.vue
View file @
fa6ad5d6
...
...
@@ -19,7 +19,7 @@ import { __, s__, sprintf } from '~/locale';
import
{
diffViewerModes
}
from
'
~/ide/constants
'
;
import
DiffStats
from
'
./diff_stats.vue
'
;
import
{
scrollToElement
}
from
'
~/lib/utils/common_utils
'
;
import
{
isCollapsed
}
from
'
../diff_file
'
;
import
{
isCollapsed
}
from
'
../
utils/
diff_file
'
;
import
{
DIFF_FILE_HEADER
}
from
'
../i18n
'
;
export
default
{
...
...
app/assets/javascripts/diffs/store/actions.js
View file @
fa6ad5d6
...
...
@@ -49,7 +49,7 @@ import {
DIFF_FILE_BY_FILE_COOKIE_NAME
,
}
from
'
../constants
'
;
import
{
diffViewerModes
}
from
'
~/ide/constants
'
;
import
{
isCollapsed
}
from
'
../diff_file
'
;
import
{
isCollapsed
}
from
'
../
utils/
diff_file
'
;
export
const
setBaseConfig
=
({
commit
},
options
)
=>
{
const
{
...
...
app/assets/javascripts/diffs/store/utils.js
View file @
fa6ad5d6
...
...
@@ -16,7 +16,7 @@ import {
SHOW_WHITESPACE
,
NO_SHOW_WHITESPACE
,
}
from
'
../constants
'
;
import
{
prepareRawDiffFile
}
from
'
../diff_file
'
;
import
{
prepareRawDiffFile
}
from
'
../
utils/
diff_file
'
;
export
const
isAdded
=
line
=>
[
'
new
'
,
'
new-nonewline
'
].
includes
(
line
.
type
);
export
const
isRemoved
=
line
=>
[
'
old
'
,
'
old-nonewline
'
].
includes
(
line
.
type
);
...
...
app/assets/javascripts/diffs/diff_file.js
→
app/assets/javascripts/diffs/
utils/
diff_file.js
View file @
fa6ad5d6
...
...
@@ -3,7 +3,7 @@ import {
DIFF_FILE_DELETED_MODE
,
DIFF_FILE_MANUAL_COLLAPSE
,
DIFF_FILE_AUTOMATIC_COLLAPSE
,
}
from
'
./constants
'
;
}
from
'
.
.
/constants
'
;
function
fileSymlinkInformation
(
file
,
fileList
)
{
const
duplicates
=
fileList
.
filter
(
iteratedFile
=>
iteratedFile
.
file_hash
===
file
.
file_hash
);
...
...
app/assets/javascripts/notes/components/diff_with_note.vue
View file @
fa6ad5d6
...
...
@@ -7,7 +7,7 @@ import DiffViewer from '~/vue_shared/components/diff_viewer/diff_viewer.vue';
import
ImageDiffOverlay
from
'
~/diffs/components/image_diff_overlay.vue
'
;
import
{
getDiffMode
}
from
'
~/diffs/store/utils
'
;
import
{
diffViewerModes
}
from
'
~/ide/constants
'
;
import
{
isCollapsed
}
from
'
../../diffs/diff_file
'
;
import
{
isCollapsed
}
from
'
../../diffs/
utils/
diff_file
'
;
const
FIRST_CHAR_REGEX
=
/^
(\+
|-|
)
/
;
...
...
spec/frontend/diffs/diff_file_spec.js
→
spec/frontend/diffs/
utils/
diff_file_spec.js
View file @
fa6ad5d6
import
{
prepareRawDiffFile
}
from
'
~/diffs/diff_file
'
;
import
{
prepareRawDiffFile
}
from
'
~/diffs/
utils/
diff_file
'
;
const
DIFF_FILES
=
[
{
...
...
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