diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2018-03-05 18:40:04 +0000 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2018-03-05 18:40:04 +0000 |
commit | e3251a4077d4667239b23437921f49a1d195406c (patch) | |
tree | b9841a7abfd7a7f211cd304235e9aeea4e5ea478 /app/assets | |
parent | 8ec0fd0a42d0c166d103433f58513e3bb94e5e7b (diff) | |
download | gitlab-ce-e3251a4077d4667239b23437921f49a1d195406c.tar.gz |
Changes after review38587-pipelines-empty-state
Diffstat (limited to 'app/assets')
5 files changed, 8 insertions, 14 deletions
diff --git a/app/assets/javascripts/commit/pipelines/pipelines_table.vue b/app/assets/javascripts/commit/pipelines/pipelines_table.vue index 3b3072ebd3e..466a5b5d635 100644 --- a/app/assets/javascripts/commit/pipelines/pipelines_table.vue +++ b/app/assets/javascripts/commit/pipelines/pipelines_table.vue @@ -88,7 +88,7 @@ <svg-blank-state v-else-if="shouldRenderErrorState" :svg-path="errorStateSvgPath" - :message="s__(`Pipelines|There was an error with fetching the pipelines. + :message="s__(`Pipelines|There was an error fetching the pipelines. Try again in a few moments or contact your support team.`)" /> diff --git a/app/assets/javascripts/pages/projects/pipelines/index/index.js b/app/assets/javascripts/pages/projects/pipelines/index/index.js index 4c092c60e72..a84e2790680 100644 --- a/app/assets/javascripts/pages/projects/pipelines/index/index.js +++ b/app/assets/javascripts/pages/projects/pipelines/index/index.js @@ -12,14 +12,13 @@ document.addEventListener('DOMContentLoaded', () => new Vue({ pipelinesComponent, }, data() { - const store = new PipelinesStore(); - return { - store, - dataset: document.querySelector(this.$options.el).dataset, + store: new PipelinesStore(), }; }, - + created() { + this.dataset = document.querySelector(this.$options.el).dataset; + }, render(createElement) { return createElement('pipelines-component', { props: { diff --git a/app/assets/javascripts/pipelines/components/empty_state.vue b/app/assets/javascripts/pipelines/components/empty_state.vue index 51f05c7827e..10ac8c08bed 100644 --- a/app/assets/javascripts/pipelines/components/empty_state.vue +++ b/app/assets/javascripts/pipelines/components/empty_state.vue @@ -43,7 +43,7 @@ <div class="text-center"> <a :href="helpPagePath" - class="btn btn-info js-get-started-pipelines" + class="btn btn-primary js-get-started-pipelines" > {{ s__('Pipelines|Get started with Pipelines') }} </a> diff --git a/app/assets/javascripts/pipelines/components/pipelines.vue b/app/assets/javascripts/pipelines/components/pipelines.vue index 54f5fb7678b..6e5ee68eeb1 100644 --- a/app/assets/javascripts/pipelines/components/pipelines.vue +++ b/app/assets/javascripts/pipelines/components/pipelines.vue @@ -323,7 +323,7 @@ <svg-blank-state v-else-if="stateToRender === $options.stateMap.error" :svg-path="errorStateSvgPath" - :message="s__(`Pipelines|There was an error with fetching the pipelines. + :message="s__(`Pipelines|There was an error fetching the pipelines. Try again in a few moments or contact your support team.`)" /> diff --git a/app/assets/javascripts/pipelines/stores/pipelines_store.js b/app/assets/javascripts/pipelines/stores/pipelines_store.js index 2f738edd241..651251d2623 100644 --- a/app/assets/javascripts/pipelines/stores/pipelines_store.js +++ b/app/assets/javascripts/pipelines/stores/pipelines_store.js @@ -5,12 +5,7 @@ export default class PipelinesStore { this.state = {}; this.state.pipelines = []; - this.state.count = { - all: 0, - finished: 0, - pending: 0, - running: 0, - }; + this.state.count = {}; this.state.pageInfo = {}; } |