diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-21 15:08:31 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-21 15:08:31 +0300 |
| commit | 28ce39a3e0e7b47e53939a15fb823af9c433327a (patch) | |
| tree | f703cd7b431827880ccb74b98d16fab0f60dd245 /doc/development | |
| parent | afe057a8ff8546f0032e439a9a200307fb6de86a (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/development')
| -rw-r--r-- | doc/development/ee_features.md | 2 | ||||
| -rw-r--r-- | doc/development/fe_guide/droplab/plugins/ajax.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/development/ee_features.md b/doc/development/ee_features.md index d716325f332..672ae5e7b27 100644 --- a/doc/development/ee_features.md +++ b/doc/development/ee_features.md @@ -835,7 +835,7 @@ information on managing page-specific JavaScript within EE. To separate Vue template differences we should [async import the components](https://vuejs.org/v2/guide/components-dynamic-async.html#Async-Components). -Doing this allows for us to load the correct component in EE whilst in CE +Doing this allows for us to load the correct component in EE while in CE we can load a empty component that renders nothing. This code **should** exist in the CE repository as well as the EE repository. diff --git a/doc/development/fe_guide/droplab/plugins/ajax.md b/doc/development/fe_guide/droplab/plugins/ajax.md index 4b76b207d88..77ba6f739e6 100644 --- a/doc/development/fe_guide/droplab/plugins/ajax.md +++ b/doc/development/fe_guide/droplab/plugins/ajax.md @@ -33,6 +33,6 @@ droplab.addHook(trigger, list, [Ajax], { ``` Optionally you can set `loadingTemplate` to a HTML string. This HTML string will -replace the dropdown list whilst the request is pending. +replace the dropdown list while the request is pending. Additionally, you can set `onError` to a function to catch any XHR errors. |