diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-27 18:10:21 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-27 18:10:21 +0300 |
| commit | eef9c80f1c3e81fcb50c51d8f419ab095d4747fd (patch) | |
| tree | 5052967f5239d74e34527e94600621e6c1ebfcc4 /doc/development/ee_features.md | |
| parent | d6404862287ded00725865e56cda3a6fb4f2a1c7 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/development/ee_features.md')
| -rw-r--r-- | doc/development/ee_features.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/development/ee_features.md b/doc/development/ee_features.md index e7954fa910b..6616c350e2b 100644 --- a/doc/development/ee_features.md +++ b/doc/development/ee_features.md @@ -929,7 +929,7 @@ export default { - We can use slots and/or scoped slots to achieve the same thing as we did with mixins. If you only need an EE component there is no need to create the CE component. -1. First, we have a CE component that can render a slot incase we need EE template and functionality to be decorated on top of the CE base. +1. First, we have a CE component that can render a slot in case we need EE template and functionality to be decorated on top of the CE base. ```vue // ./ce/my_component.vue @@ -1030,7 +1030,7 @@ separate SCSS file in an appropriate directory within `app/assets/stylesheets`. In some cases, this is not entirely possible or creating dedicated SCSS file is an overkill, e.g. a text style of some component is different for EE. In such cases, -styles are usually kept in stylesheet that is common for both CE and EE, and it is wise +styles are usually kept in a stylesheet that is common for both CE and EE, and it is wise to isolate such ruleset from rest of CE rules (along with adding comment describing the same) to avoid conflicts during CE to EE merge. |