diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2018-06-25 10:05:26 +0100 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2018-06-25 10:05:26 +0100 |
commit | ab339cf68b4d7cbc05a20e3555f86980b7c0d91c (patch) | |
tree | c000853a68567d11754f9e8eb8c3a0cc2492f70e /app/assets/javascripts/boards/components/modal | |
parent | decd7d951b6de25c3b06ff84146ce16fd3588e70 (diff) | |
parent | 9490c378338bd415ad0a53897a85b6acda4ec676 (diff) | |
download | gitlab-ce-ab339cf68b4d7cbc05a20e3555f86980b7c0d91c.tar.gz |
Merge branch 'master' into fl-fix-tech-debt
* master: (67 commits)
(Part 1) Resolve "Recognise when a user is trying to validate a private SSH key"
Fix auto_cancel_pending_pipelines check
Resolve "2FA should not attempt to use U2F in unsupported browsers"
Resolve "Change the BitBucket import page to indicate that its for BB Cloud only, not for on-prem BB"
Resolve "Help users find our contributing page"
Docs broken links
Refactor issue boards and get the EE changes to CE
Adds test to cover the fix in #45575
Log push output on exception
Update gitlab_chart.md
Remove top margin for bootstrap popover headers
Bump sprockets to 3.7.2 to address CVE-2018-3760
Bring changes from EE
Bring changes from EE
Simplify the decode secret step
Cleanup ruby sampler metrics
Raw diffs are served from Gitaly
add inline badges to auto devops feature list
Add more large tables to cop
Bring changes from EE
...
Diffstat (limited to 'app/assets/javascripts/boards/components/modal')
-rw-r--r-- | app/assets/javascripts/boards/components/modal/empty_state.vue (renamed from app/assets/javascripts/boards/components/modal/empty_state.js) | 62 | ||||
-rw-r--r-- | app/assets/javascripts/boards/components/modal/index.js | 4 |
2 files changed, 35 insertions, 31 deletions
diff --git a/app/assets/javascripts/boards/components/modal/empty_state.js b/app/assets/javascripts/boards/components/modal/empty_state.vue index 888bc9d7ef2..dbd69f84526 100644 --- a/app/assets/javascripts/boards/components/modal/empty_state.js +++ b/app/assets/javascripts/boards/components/modal/empty_state.vue @@ -1,8 +1,8 @@ -import Vue from 'vue'; +<script> import ModalStore from '../../stores/modal_store'; import modalMixin from '../../mixins/modal_mixins'; -gl.issueBoards.ModalEmptyState = Vue.extend({ +export default { mixins: [modalMixin], props: { newIssuePath: { @@ -38,32 +38,36 @@ gl.issueBoards.ModalEmptyState = Vue.extend({ return obj; }, }, - template: ` - <section class="empty-state"> - <div class="row"> - <div class="col-12 col-md-6 order-md-last"> - <aside class="svg-content"><img :src="emptyStateSvg"/></aside> - </div> - <div class="col-12 col-md-6 order-md-first"> - <div class="text-content"> - <h4>{{ contents.title }}</h4> - <p v-html="contents.content"></p> - <a - :href="newIssuePath" - class="btn btn-success btn-inverted" - v-if="activeTab === 'all'"> - New issue - </a> - <button - type="button" - class="btn btn-default" - @click="changeTab('all')" - v-if="activeTab === 'selected'"> - Open issues - </button> - </div> +}; +</script> + +<template> + <section class="empty-state"> + <div class="row"> + <div class="col-12 col-md-6 order-md-last"> + <aside class="svg-content"><img :src="emptyStateSvg"/></aside> + </div> + <div class="col-12 col-md-6 order-md-first"> + <div class="text-content"> + <h4>{{ contents.title }}</h4> + <p v-html="contents.content"></p> + <a + v-if="activeTab === 'all'" + :href="newIssuePath" + class="btn btn-success btn-inverted" + > + New issue + </a> + <button + v-if="activeTab === 'selected'" + class="btn btn-default" + type="button" + @click="changeTab('all')" + > + Open issues + </button> </div> </div> - </section> - `, -}); + </div> + </section> +</template> diff --git a/app/assets/javascripts/boards/components/modal/index.js b/app/assets/javascripts/boards/components/modal/index.js index c8b2f45f177..c10397eaaba 100644 --- a/app/assets/javascripts/boards/components/modal/index.js +++ b/app/assets/javascripts/boards/components/modal/index.js @@ -6,15 +6,15 @@ import loadingIcon from '~/vue_shared/components/loading_icon.vue'; import './header'; import './list'; import './footer'; -import './empty_state'; +import EmptyState from './empty_state.vue'; import ModalStore from '../../stores/modal_store'; gl.issueBoards.IssuesModal = Vue.extend({ components: { + EmptyState, 'modal-header': gl.issueBoards.ModalHeader, 'modal-list': gl.issueBoards.ModalList, 'modal-footer': gl.issueBoards.ModalFooter, - 'empty-state': gl.issueBoards.ModalEmptyState, loadingIcon, }, props: { |