Commit 5b38c607 authored by Phil Hughes's avatar Phil Hughes

Merge branch 'tor/maintenance/move-uuids' into 'master'

Move the UUID module to a more global Utils home

See merge request gitlab-org/gitlab!61285
parents f5d73168 8b63090e
import { ApolloLink, Observable } from 'apollo-link'; import { ApolloLink, Observable } from 'apollo-link';
import { print } from 'graphql'; import { print } from 'graphql';
import cable from '~/actioncable_consumer'; import cable from '~/actioncable_consumer';
import { uuids } from '~/diffs/utils/uuids'; import { uuids } from '~/lib/utils/uuids';
export default class ActionCableLink extends ApolloLink { export default class ActionCableLink extends ApolloLink {
// eslint-disable-next-line class-methods-use-this // eslint-disable-next-line class-methods-use-this
......
import { truncateSha } from '~/lib/utils/text_utility'; import { truncateSha } from '~/lib/utils/text_utility';
import { uuids } from '~/lib/utils/uuids';
import { import {
DIFF_FILE_SYMLINK_MODE, DIFF_FILE_SYMLINK_MODE,
...@@ -7,7 +8,6 @@ import { ...@@ -7,7 +8,6 @@ import {
DIFF_FILE_AUTOMATIC_COLLAPSE, DIFF_FILE_AUTOMATIC_COLLAPSE,
} from '../constants'; } from '../constants';
import { getDerivedMergeRequestInformation } from './merge_request'; import { getDerivedMergeRequestInformation } from './merge_request';
import { uuids } from './uuids';
function fileSymlinkInformation(file, fileList) { function fileSymlinkInformation(file, fileList) {
const duplicates = fileList.filter((iteratedFile) => iteratedFile.file_hash === file.file_hash); const duplicates = fileList.filter((iteratedFile) => iteratedFile.file_hash === file.file_hash);
......
import { editor as monacoEditor, languages as monacoLanguages, Uri } from 'monaco-editor'; 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 { defaultEditorOptions } from '~/ide/lib/editor_options';
import languages from '~/ide/lib/languages'; import languages from '~/ide/lib/languages';
import { DEFAULT_THEME, themes } from '~/ide/lib/themes'; import { DEFAULT_THEME, themes } from '~/ide/lib/themes';
import { registerLanguages } from '~/ide/utils'; import { registerLanguages } from '~/ide/utils';
import { joinPaths } from '~/lib/utils/url_utility'; import { joinPaths } from '~/lib/utils/url_utility';
import { uuids } from '~/lib/utils/uuids';
import { import {
EDITOR_LITE_INSTANCE_ERROR_NO_EL, EDITOR_LITE_INSTANCE_ERROR_NO_EL,
URI_PREFIX, URI_PREFIX,
......
import { uuids } from '../../diffs/utils/uuids'; import { uuids } from './uuids';
/** /**
* @module recurrence * @module recurrence
......
...@@ -4,7 +4,7 @@ import cable from '~/actioncable_consumer'; ...@@ -4,7 +4,7 @@ import cable from '~/actioncable_consumer';
import ActionCableLink from '~/actioncable_link'; import ActionCableLink from '~/actioncable_link';
// Mock uuids module for determinism // Mock uuids module for determinism
jest.mock('~/diffs/utils/uuids', () => ({ jest.mock('~/lib/utils/uuids', () => ({
uuids: () => ['testuuid'], uuids: () => ['testuuid'],
})); }));
......
import { uuids } from '~/diffs/utils/uuids'; import { uuids } from '~/lib/utils/uuids';
const HEX = /[a-f0-9]/i; const HEX = /[a-f0-9]/i;
const HEX_RE = HEX.source; const HEX_RE = HEX.source;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment