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
0
Merge Requests
0
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
Léo-Paul Géneau
gitlab-ce
Commits
16e584c7
Commit
16e584c7
authored
Apr 10, 2018
by
George Tsiolis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move PipelineFailed vue component
parent
a56611e3
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
38 additions
and
23 deletions
+38
-23
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_pipeline_failed.js
...est_widget/components/states/mr_widget_pipeline_failed.js
+0
-18
app/assets/javascripts/vue_merge_request_widget/components/states/pipeline_failed.vue
...erge_request_widget/components/states/pipeline_failed.vue
+25
-0
app/assets/javascripts/vue_merge_request_widget/dependencies.js
...sets/javascripts/vue_merge_request_widget/dependencies.js
+1
-1
changelogs/unreleased/move-pipeline-failed-vue-component.yml
changelogs/unreleased/move-pipeline-failed-vue-component.yml
+5
-0
spec/javascripts/vue_mr_widget/components/states/mr_widget_pipeline_failed_spec.js
...idget/components/states/mr_widget_pipeline_failed_spec.js
+7
-4
No files found.
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_pipeline_failed.js
deleted
100644 → 0
View file @
a56611e3
import
statusIcon
from
'
../mr_widget_status_icon.vue
'
;
export
default
{
name
:
'
MRWidgetPipelineBlocked
'
,
components
:
{
statusIcon
,
},
template
:
`
<div class="mr-widget-body media">
<status-icon status="warning" :show-disabled-button="true" />
<div class="media-body space-children">
<span class="bold">
The pipeline for this merge request failed. Please retry the job or push a new commit to fix the failure
</span>
</div>
</div>
`
,
};
app/assets/javascripts/vue_merge_request_widget/components/states/pipeline_failed.vue
0 → 100644
View file @
16e584c7
<
script
>
import
statusIcon
from
'
../mr_widget_status_icon.vue
'
;
export
default
{
name
:
'
PipelineFailed
'
,
components
:
{
statusIcon
,
},
};
</
script
>
<
template
>
<div
class=
"mr-widget-body media"
>
<status-icon
status=
"warning"
:show-disabled-button=
"true"
/>
<div
class=
"media-body space-children"
>
<span
class=
"bold"
>
{{
s__
(
`mrWidget|The pipeline for this merge request failed.
Please retry the job or push a new commit to fix the failure`
)
}}
</span>
</div>
</div>
</
template
>
app/assets/javascripts/vue_merge_request_widget/dependencies.js
View file @
16e584c7
...
...
@@ -31,7 +31,7 @@ export { default as ReadyToMergeState } from './components/states/ready_to_merge
export
{
default
as
ShaMismatchState
}
from
'
./components/states/sha_mismatch.vue
'
;
export
{
default
as
UnresolvedDiscussionsState
}
from
'
./components/states/unresolved_discussions.vue
'
;
export
{
default
as
PipelineBlockedState
}
from
'
./components/states/mr_widget_pipeline_blocked.vue
'
;
export
{
default
as
PipelineFailedState
}
from
'
./components/states/
mr_widget_pipeline_failed
'
;
export
{
default
as
PipelineFailedState
}
from
'
./components/states/
pipeline_failed.vue
'
;
export
{
default
as
MergeWhenPipelineSucceedsState
}
from
'
./components/states/mr_widget_merge_when_pipeline_succeeds.vue
'
;
export
{
default
as
RebaseState
}
from
'
./components/states/mr_widget_rebase.vue
'
;
export
{
default
as
AutoMergeFailed
}
from
'
./components/states/mr_widget_auto_merge_failed.vue
'
;
...
...
changelogs/unreleased/move-pipeline-failed-vue-component.yml
0 → 100644
View file @
16e584c7
---
title
:
Move PipelineFailed vue component
merge_request
:
18277
author
:
George Tsiolis
type
:
performance
spec/javascripts/vue_mr_widget/components/states/mr_widget_pipeline_failed_spec.js
View file @
16e584c7
import
Vue
from
'
vue
'
;
import
pipelineFailedComponent
from
'
~/vue_merge_request_widget/components/states/mr_widget_pipeline_failed
'
;
import
PipelineFailed
from
'
~/vue_merge_request_widget/components/states/pipeline_failed.vue
'
;
import
{
removeBreakLine
}
from
'
spec/helpers/vue_component_helper
'
;
describe
(
'
MRWidget
PipelineFailed
'
,
()
=>
{
describe
(
'
PipelineFailed
'
,
()
=>
{
describe
(
'
template
'
,
()
=>
{
const
Component
=
Vue
.
extend
(
pipelineFailedComponent
);
const
Component
=
Vue
.
extend
(
PipelineFailed
);
const
vm
=
new
Component
({
el
:
document
.
createElement
(
'
div
'
),
});
it
(
'
should have correct elements
'
,
()
=>
{
expect
(
vm
.
$el
.
classList
.
contains
(
'
mr-widget-body
'
)).
toBeTruthy
();
expect
(
vm
.
$el
.
querySelector
(
'
button
'
).
getAttribute
(
'
disabled
'
)).
toBeTruthy
();
expect
(
vm
.
$el
.
innerText
).
toContain
(
'
The pipeline for this merge request failed. Please retry the job or push a new commit to fix the failure
'
);
expect
(
removeBreakLine
(
vm
.
$el
.
innerText
).
trim
(),
).
toContain
(
'
The pipeline for this merge request failed. Please retry the job or push a new commit to fix the failure
'
);
});
});
});
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