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
8b63090e
Commit
8b63090e
authored
May 07, 2021
by
Thomas Randolph
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move the UUID module to a more global Utils home
parent
0138e330
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
6 additions
and
6 deletions
+6
-6
app/assets/javascripts/actioncable_link.js
app/assets/javascripts/actioncable_link.js
+1
-1
app/assets/javascripts/diffs/utils/diff_file.js
app/assets/javascripts/diffs/utils/diff_file.js
+1
-1
app/assets/javascripts/editor/editor_lite.js
app/assets/javascripts/editor/editor_lite.js
+1
-1
app/assets/javascripts/lib/utils/recurrence.js
app/assets/javascripts/lib/utils/recurrence.js
+1
-1
app/assets/javascripts/lib/utils/uuids.js
app/assets/javascripts/lib/utils/uuids.js
+0
-0
spec/frontend/actioncable_link_spec.js
spec/frontend/actioncable_link_spec.js
+1
-1
spec/frontend/lib/utils/uuids_spec.js
spec/frontend/lib/utils/uuids_spec.js
+1
-1
No files found.
app/assets/javascripts/actioncable_link.js
View file @
8b63090e
import
{
ApolloLink
,
Observable
}
from
'
apollo-link
'
;
import
{
print
}
from
'
graphql
'
;
import
cable
from
'
~/actioncable_consumer
'
;
import
{
uuids
}
from
'
~/
diffs
/utils/uuids
'
;
import
{
uuids
}
from
'
~/
lib
/utils/uuids
'
;
export
default
class
ActionCableLink
extends
ApolloLink
{
// eslint-disable-next-line class-methods-use-this
...
...
app/assets/javascripts/diffs/utils/diff_file.js
View file @
8b63090e
import
{
truncateSha
}
from
'
~/lib/utils/text_utility
'
;
import
{
uuids
}
from
'
~/lib/utils/uuids
'
;
import
{
DIFF_FILE_SYMLINK_MODE
,
...
...
@@ -7,7 +8,6 @@ import {
DIFF_FILE_AUTOMATIC_COLLAPSE
,
}
from
'
../constants
'
;
import
{
getDerivedMergeRequestInformation
}
from
'
./merge_request
'
;
import
{
uuids
}
from
'
./uuids
'
;
function
fileSymlinkInformation
(
file
,
fileList
)
{
const
duplicates
=
fileList
.
filter
((
iteratedFile
)
=>
iteratedFile
.
file_hash
===
file
.
file_hash
);
...
...
app/assets/javascripts/editor/editor_lite.js
View file @
8b63090e
import
{
editor
as
monacoEditor
,
languages
as
monacoLanguages
,
Uri
}
from
'
monaco-editor
'
;
import
{
uuids
}
from
'
~/diffs/utils/uuids
'
;
import
{
defaultEditorOptions
}
from
'
~/ide/lib/editor_options
'
;
import
languages
from
'
~/ide/lib/languages
'
;
import
{
DEFAULT_THEME
,
themes
}
from
'
~/ide/lib/themes
'
;
import
{
registerLanguages
}
from
'
~/ide/utils
'
;
import
{
joinPaths
}
from
'
~/lib/utils/url_utility
'
;
import
{
uuids
}
from
'
~/lib/utils/uuids
'
;
import
{
EDITOR_LITE_INSTANCE_ERROR_NO_EL
,
URI_PREFIX
,
...
...
app/assets/javascripts/lib/utils/recurrence.js
View file @
8b63090e
import
{
uuids
}
from
'
.
./../diffs/utils
/uuids
'
;
import
{
uuids
}
from
'
./uuids
'
;
/**
* @module recurrence
...
...
app/assets/javascripts/
diffs
/utils/uuids.js
→
app/assets/javascripts/
lib
/utils/uuids.js
View file @
8b63090e
File moved
spec/frontend/actioncable_link_spec.js
View file @
8b63090e
...
...
@@ -4,7 +4,7 @@ import cable from '~/actioncable_consumer';
import
ActionCableLink
from
'
~/actioncable_link
'
;
// Mock uuids module for determinism
jest
.
mock
(
'
~/
diffs
/utils/uuids
'
,
()
=>
({
jest
.
mock
(
'
~/
lib
/utils/uuids
'
,
()
=>
({
uuids
:
()
=>
[
'
testuuid
'
],
}));
...
...
spec/frontend/
diffs
/utils/uuids_spec.js
→
spec/frontend/
lib
/utils/uuids_spec.js
View file @
8b63090e
import
{
uuids
}
from
'
~/
diffs
/utils/uuids
'
;
import
{
uuids
}
from
'
~/
lib
/utils/uuids
'
;
const
HEX
=
/
[
a-f0-9
]
/i
;
const
HEX_RE
=
HEX
.
source
;
...
...
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