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
4cc88f59
Commit
4cc88f59
authored
Apr 06, 2017
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
convert pipeline error state to vue template
parent
90971841
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
24 additions
and
22 deletions
+24
-22
app/assets/javascripts/commit/pipelines/pipelines_table.js
app/assets/javascripts/commit/pipelines/pipelines_table.js
+1
-1
app/assets/javascripts/vue_pipelines_index/components/error_state.js
...javascripts/vue_pipelines_index/components/error_state.js
+0
-19
app/assets/javascripts/vue_pipelines_index/components/error_state.vue
...avascripts/vue_pipelines_index/components/error_state.vue
+21
-0
app/assets/javascripts/vue_pipelines_index/pipelines.js
app/assets/javascripts/vue_pipelines_index/pipelines.js
+1
-1
spec/javascripts/vue_pipelines_index/error_state_spec.js
spec/javascripts/vue_pipelines_index/error_state_spec.js
+1
-1
No files found.
app/assets/javascripts/commit/pipelines/pipelines_table.js
View file @
4cc88f59
...
...
@@ -5,7 +5,7 @@ import PipelinesService from '../../vue_pipelines_index/services/pipelines_servi
import
PipelineStore
from
'
../../vue_pipelines_index/stores/pipelines_store
'
;
import
eventHub
from
'
../../vue_pipelines_index/event_hub
'
;
import
EmptyState
from
'
../../vue_pipelines_index/components/empty_state.vue
'
;
import
ErrorState
from
'
../../vue_pipelines_index/components/error_state
'
;
import
ErrorState
from
'
../../vue_pipelines_index/components/error_state
.vue
'
;
import
'
../../lib/utils/common_utils
'
;
import
'
../../vue_shared/vue_resource_interceptor
'
;
import
Poll
from
'
../../lib/utils/poll
'
;
...
...
app/assets/javascripts/vue_pipelines_index/components/error_state.js
deleted
100644 → 0
View file @
90971841
import
pipelinesErrorStateSVG
from
'
empty_states/icons/_pipelines_failed.svg
'
;
export
default
{
template
:
`
<div class="row empty-state js-pipelines-error-state">
<div class="col-xs-12">
<div class="svg-content">
${
pipelinesErrorStateSVG
}
</div>
</div>
<div class="col-xs-12 text-center">
<div class="text-content">
<h4>The API failed to fetch the pipelines.</h4>
</div>
</div>
</div>
`
,
};
app/assets/javascripts/vue_pipelines_index/components/error_state.vue
0 → 100644
View file @
4cc88f59
<
script
>
import
pipelinesErrorStateSVG
from
'
empty_states/icons/_pipelines_failed.svg
'
;
export
default
{
data
:
()
=>
({
pipelinesErrorStateSVG
}),
};
</
script
>
<
template
>
<div
class=
"row empty-state js-pipelines-error-state"
>
<div
class=
"col-xs-12"
>
<div
class=
"svg-content"
v-html=
"pipelinesErrorStateSVG"
/>
</div>
<div
class=
"col-xs-12 text-center"
>
<div
class=
"text-content"
>
<h4>
The API failed to fetch the pipelines.
</h4>
</div>
</div>
</div>
</
template
>
app/assets/javascripts/vue_pipelines_index/pipelines.js
View file @
4cc88f59
...
...
@@ -5,7 +5,7 @@ import eventHub from './event_hub';
import
PipelinesTableComponent
from
'
../vue_shared/components/pipelines_table
'
;
import
TablePaginationComponent
from
'
../vue_shared/components/table_pagination
'
;
import
EmptyState
from
'
./components/empty_state.vue
'
;
import
ErrorState
from
'
./components/error_state
'
;
import
ErrorState
from
'
./components/error_state
.vue
'
;
import
NavigationTabs
from
'
./components/navigation_tabs
'
;
import
NavigationControls
from
'
./components/nav_controls
'
;
import
Poll
from
'
../lib/utils/poll
'
;
...
...
spec/javascripts/vue_pipelines_index/error_state_spec.js
View file @
4cc88f59
import
Vue
from
'
vue
'
;
import
errorStateComp
from
'
~/vue_pipelines_index/components/error_state
'
;
import
errorStateComp
from
'
~/vue_pipelines_index/components/error_state
.vue
'
;
describe
(
'
Pipelines Error State
'
,
()
=>
{
let
component
;
...
...
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