summaryrefslogtreecommitdiff
path: root/doc/development/fe_guide
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-21 12:08:31 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-21 12:08:31 +0000
commit28ce39a3e0e7b47e53939a15fb823af9c433327a (patch)
treef703cd7b431827880ccb74b98d16fab0f60dd245 /doc/development/fe_guide
parentafe057a8ff8546f0032e439a9a200307fb6de86a (diff)
downloadgitlab-ce-28ce39a3e0e7b47e53939a15fb823af9c433327a.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/development/fe_guide')
-rw-r--r--doc/development/fe_guide/droplab/plugins/ajax.md2
1 files changed, 1 insertions, 1 deletions
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.