summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Read <eread@gitlab.com>2019-04-01 02:29:59 +0000
committerEvan Read <eread@gitlab.com>2019-04-01 02:29:59 +0000
commitcc0a3b8c9218e2aa23afdce7e69344a07d686df9 (patch)
treeb1280f3fe56f6301c79464c887f7590a68ff3e50
parenta615a6b2a4f1d0dd1980b7a0a28090e04846f442 (diff)
parent1d6b8eab528781875b759bb59a87f2aa6a284fab (diff)
downloadgitlab-ce-cc0a3b8c9218e2aa23afdce7e69344a07d686df9.tar.gz
Merge branch 'docs-fix-import-mixin-from-ee-else-ce-path-example' into 'master'
Fix example block for mixin from ee-else-ce path See merge request gitlab-org/gitlab-ce!26808
-rw-r--r--doc/development/ee_features.md13
1 files changed, 7 insertions, 6 deletions
diff --git a/doc/development/ee_features.md b/doc/development/ee_features.md
index 41a64044c68..c2e05b2d065 100644
--- a/doc/development/ee_features.md
+++ b/doc/development/ee_features.md
@@ -909,14 +909,15 @@ export default {
- Since we [can't async load a mixin](https://github.com/vuejs/vue-loader/issues/418#issuecomment-254032223) we will use the [`ee_else_ce`](https://docs.gitlab.com/ee/development/ee_features.html#javascript-code-in-assetsjavascripts) alias we already have for webpack.
- This means all the EE specific props, computed properties, methods, etc that are EE only should be in a mixin in the `ee/` folder and we need to create a CE counterpart of the mixin
- ##### Example:
- ```javascript
- import mixin from 'ee_else_ce/path/mixin';
+##### Example:
+```javascript
+import mixin from 'ee_else_ce/path/mixin';
- {
+{
mixins: [mixin]
- }
- ```
+}
+```
+
- Computed Properties/methods and getters only used in the child import still need a counterpart in CE
- For store modules, we will need a CE counterpart too.