diff options
| author | Phil Hughes <me@iamphill.com> | 2019-07-17 14:41:43 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-07-17 14:41:43 +0000 |
| commit | 1e5b8087b1711b7a22d79f5086cf923575437b61 (patch) | |
| tree | 43a3624fd83696aa48a3f2cc6db0306cfb25b9b1 | |
| parent | 4851d4e1f0b9f3b6f8bbeb5d143c32bcbac2d0f0 (diff) | |
| parent | 0aea28c093069f12bdb4d740217cfb1d396b6af8 (diff) | |
| download | gitlab-ce-1e5b8087b1711b7a22d79f5086cf923575437b61.tar.gz | |
Merge branch '10009-boards-index' into 'master'
Removes EE differences for modal issues board
See merge request gitlab-org/gitlab-ce!30836
| -rw-r--r-- | app/assets/javascripts/boards/components/modal/footer.vue | 3 | ||||
| -rw-r--r-- | app/assets/javascripts/boards/mixins/modal_footer.js | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/javascripts/boards/components/modal/footer.vue b/app/assets/javascripts/boards/components/modal/footer.vue index eea0fb71c1a..5f100c617a0 100644 --- a/app/assets/javascripts/boards/components/modal/footer.vue +++ b/app/assets/javascripts/boards/components/modal/footer.vue @@ -1,4 +1,5 @@ <script> +import footerEEMixin from 'ee_else_ce/boards/mixins/modal_footer'; import Flash from '../../../flash'; import { __, n__ } from '../../../locale'; import ListsDropdown from './lists_dropdown.vue'; @@ -10,7 +11,7 @@ export default { components: { ListsDropdown, }, - mixins: [modalMixin], + mixins: [modalMixin, footerEEMixin], data() { return { modal: ModalStore.store, diff --git a/app/assets/javascripts/boards/mixins/modal_footer.js b/app/assets/javascripts/boards/mixins/modal_footer.js new file mode 100644 index 00000000000..ff8b4c56321 --- /dev/null +++ b/app/assets/javascripts/boards/mixins/modal_footer.js @@ -0,0 +1 @@ +export default {}; |