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
2e3950ff
Commit
2e3950ff
authored
Feb 04, 2021
by
Vitaly Slobodin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Sort JS imports after merging master
parent
e5398fc5
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
14 additions
and
15 deletions
+14
-15
app/assets/javascripts/pipeline_editor/components/commit/commit_section.vue
...ipts/pipeline_editor/components/commit/commit_section.vue
+3
-3
app/assets/javascripts/pipeline_editor/components/pipeline_editor_tabs.vue
...ripts/pipeline_editor/components/pipeline_editor_tabs.vue
+1
-1
ee/spec/frontend/analytics/repository_analytics/components/test_coverage_table_spec.js
...pository_analytics/components/test_coverage_table_spec.js
+1
-1
spec/frontend/pipeline_editor/components/commit/commit_section_spec.js
.../pipeline_editor/components/commit/commit_section_spec.js
+1
-1
spec/frontend/pipeline_editor/components/text_editor_spec.js
spec/frontend/pipeline_editor/components/text_editor_spec.js
+2
-3
spec/frontend/pipeline_editor/pipeline_editor_app_spec.js
spec/frontend/pipeline_editor/pipeline_editor_app_spec.js
+6
-6
No files found.
app/assets/javascripts/pipeline_editor/components/commit/commit_section.vue
View file @
2e3950ff
<
script
>
import
CommitForm
from
'
./commit_form.vue
'
;
import
{
mergeUrlParams
,
redirectTo
}
from
'
~/lib/utils/url_utility
'
;
import
{
__
,
s__
,
sprintf
}
from
'
~/locale
'
;
import
commitCIFile
from
'
../../graphql/mutations/commit_ci_file.mutation.graphql
'
;
import
getCommitSha
from
'
../../graphql/queries/client/commit_sha.graphql
'
;
import
{
COMMIT_FAILURE
,
COMMIT_SUCCESS
}
from
'
../../constants
'
;
import
{
mergeUrlParams
,
redirectTo
}
from
'
~/lib/utils/url_utility
'
;
import
{
__
,
s__
,
sprintf
}
from
'
~/locale
'
;
import
CommitForm
from
'
./commit_form.vue
'
;
const
MR_SOURCE_BRANCH
=
'
merge_request[source_branch]
'
;
const
MR_TARGET_BRANCH
=
'
merge_request[target_branch]
'
;
...
...
app/assets/javascripts/pipeline_editor/components/pipeline_editor_tabs.vue
View file @
2e3950ff
...
...
@@ -2,10 +2,10 @@
import
{
GlLoadingIcon
,
GlTabs
,
GlTab
}
from
'
@gitlab/ui
'
;
import
{
s__
}
from
'
~/locale
'
;
import
glFeatureFlagsMixin
from
'
~/vue_shared/mixins/gl_feature_flags_mixin
'
;
import
PipelineGraph
from
'
~/pipelines/components/pipeline_graph/pipeline_graph.vue
'
;
import
CiLint
from
'
./lint/ci_lint.vue
'
;
import
EditorTab
from
'
./ui/editor_tab.vue
'
;
import
TextEditor
from
'
./text_editor.vue
'
;
import
PipelineGraph
from
'
~/pipelines/components/pipeline_graph/pipeline_graph.vue
'
;
export
default
{
i18n
:
{
...
...
ee/spec/frontend/analytics/repository_analytics/components/test_coverage_table_spec.js
View file @
2e3950ff
...
...
@@ -6,8 +6,8 @@ import getProjectsTestCoverage from 'ee/analytics/repository_analytics/graphql/q
import
createMockApollo
from
'
helpers/mock_apollo_helper
'
;
import
waitForPromises
from
'
helpers/wait_for_promises
'
;
import
{
getTimeago
}
from
'
~/lib/utils/datetime_utility
'
;
import
{
defaultTestCoverageTable
,
projects
}
from
'
../mock_data
'
;
import
Api
from
'
~/api
'
;
import
{
defaultTestCoverageTable
,
projects
}
from
'
../mock_data
'
;
jest
.
mock
(
'
~/api.js
'
);
...
...
spec/frontend/pipeline_editor/components/commit/commit_section_spec.js
View file @
2e3950ff
...
...
@@ -5,6 +5,7 @@ import CommitForm from '~/pipeline_editor/components/commit/commit_form.vue';
import
{
objectToQuery
,
redirectTo
}
from
'
~/lib/utils/url_utility
'
;
import
commitCreate
from
'
~/pipeline_editor/graphql/mutations/commit_ci_file.mutation.graphql
'
;
import
{
COMMIT_SUCCESS
}
from
'
~/pipeline_editor/constants
'
;
import
{
mockCiConfigPath
,
mockCiYml
,
...
...
@@ -15,7 +16,6 @@ import {
mockProjectFullPath
,
mockNewMergeRequestPath
,
}
from
'
../../mock_data
'
;
import
{
COMMIT_SUCCESS
}
from
'
~/pipeline_editor/constants
'
;
jest
.
mock
(
'
~/lib/utils/url_utility
'
,
()
=>
({
redirectTo
:
jest
.
fn
(),
...
...
spec/frontend/pipeline_editor/components/text_editor_spec.js
View file @
2e3950ff
import
{
shallowMount
}
from
'
@vue/test-utils
'
;
import
{
EDITOR_READY_EVENT
}
from
'
~/editor/constants
'
;
import
TextEditor
from
'
~/pipeline_editor/components/text_editor.vue
'
;
import
{
mockCiConfigPath
,
mockCiYml
,
...
...
@@ -8,9 +10,6 @@ import {
mockProjectNamespace
,
}
from
'
../mock_data
'
;
import
{
EDITOR_READY_EVENT
}
from
'
~/editor/constants
'
;
import
TextEditor
from
'
~/pipeline_editor/components/text_editor.vue
'
;
describe
(
'
Pipeline Editor | Text editor component
'
,
()
=>
{
let
wrapper
;
...
...
spec/frontend/pipeline_editor/pipeline_editor_app_spec.js
View file @
2e3950ff
...
...
@@ -6,6 +6,12 @@ import createMockApollo from 'helpers/mock_apollo_helper';
import
TextEditor
from
'
~/pipeline_editor/components/text_editor.vue
'
;
import
httpStatusCodes
from
'
~/lib/utils/http_status
'
;
import
{
COMMIT_SUCCESS
,
COMMIT_FAILURE
,
LOAD_FAILURE_UNKNOWN
}
from
'
~/pipeline_editor/constants
'
;
import
CommitForm
from
'
~/pipeline_editor/components/commit/commit_form.vue
'
;
import
getCiConfigData
from
'
~/pipeline_editor/graphql/queries/ci_config.graphql
'
;
import
PipelineEditorApp
from
'
~/pipeline_editor/pipeline_editor_app.vue
'
;
import
PipelineEditorHome
from
'
~/pipeline_editor/pipeline_editor_home.vue
'
;
import
{
mockCiConfigPath
,
mockCiConfigQueryResponse
,
...
...
@@ -14,12 +20,6 @@ import {
mockProjectFullPath
,
}
from
'
./mock_data
'
;
import
{
COMMIT_SUCCESS
,
COMMIT_FAILURE
,
LOAD_FAILURE_UNKNOWN
}
from
'
~/pipeline_editor/constants
'
;
import
CommitForm
from
'
~/pipeline_editor/components/commit/commit_form.vue
'
;
import
getCiConfigData
from
'
~/pipeline_editor/graphql/queries/ci_config.graphql
'
;
import
PipelineEditorApp
from
'
~/pipeline_editor/pipeline_editor_app.vue
'
;
import
PipelineEditorHome
from
'
~/pipeline_editor/pipeline_editor_home.vue
'
;
const
localVue
=
createLocalVue
();
localVue
.
use
(
VueApollo
);
...
...
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