Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2017-07-25 16:09:30 +0300
committerFilipa Lacerda <filipa@gitlab.com>2017-07-25 16:09:30 +0300
commit0d451a934f671f559ed380da5f08a32723ffade4 (patch)
treeda125c7c82814d5f946e6c3f99e0af4d32eeff91 /doc
parent1162257080a2485398e84cdd52e1c6f6fa5b5d45 (diff)
parent069a4a02e075548267266be2dcceb4002ba7be81 (diff)
Merge branch 'patch-24' into 'master'
Add directives to Vue component ordering See merge request !13065
Diffstat (limited to 'doc')
-rw-r--r--doc/development/fe_guide/style_guide_js.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/development/fe_guide/style_guide_js.md b/doc/development/fe_guide/style_guide_js.md
index ae844fa1051..149a0159680 100644
--- a/doc/development/fe_guide/style_guide_js.md
+++ b/doc/development/fe_guide/style_guide_js.md
@@ -447,6 +447,7 @@ A forEach will cause side effects, it will be mutating the array being iterated.
1. `name`
1. `props`
1. `mixins`
+ 1. `directives`
1. `data`
1. `components`
1. `computedProps`