summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2018-05-25 21:05:53 +0000
committerMike Greiling <mike@pixelcog.com>2018-05-25 21:05:53 +0000
commit74894a38779adb32a8b8a3cdad8358fc98693403 (patch)
tree4bf957d7b513797b03e571f451a760e2eb1524d8 /doc
parent6f4935bcee76a7af532399945f440a8fbd15658e (diff)
parentd219ed25fa0b67984984f0b5f60f1eff7a0c34c9 (diff)
downloadgitlab-ce-74894a38779adb32a8b8a3cdad8358fc98693403.tar.gz
Merge branch 'bootstrap4' into 'master'
Upgrade to Bootstrap 4 Closes #45185 and #46710 See merge request gitlab-org/gitlab-ce!18232
Diffstat (limited to 'doc')
-rw-r--r--doc/development/fe_guide/style_guide_js.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/development/fe_guide/style_guide_js.md b/doc/development/fe_guide/style_guide_js.md
index 04dfe418dbe..284b4b53334 100644
--- a/doc/development/fe_guide/style_guide_js.md
+++ b/doc/development/fe_guide/style_guide_js.md
@@ -632,7 +632,7 @@ Useful links:
// good
<span title="tooltip text">Foo</span>
- $('span').tooltip('fixTitle');
+ $('span').tooltip('_fixTitle');
```
### The Javascript/Vue Accord