summaryrefslogtreecommitdiff
path: root/doc/development/ee_features.md
diff options
context:
space:
mode:
authorClement Ho <ClemMakesApps@gmail.com>2018-03-13 13:09:37 -0500
committerClement Ho <ClemMakesApps@gmail.com>2018-03-13 13:09:37 -0500
commit736b4ecf8efa034d95923e8741fb0e31b0d15bfe (patch)
tree96ed63e408c2ac24cc704a6b5a48b3497ed01f16 /doc/development/ee_features.md
parent2e5de941392c8463a5e15e9f8cb3a3ab147b656d (diff)
parent8f73ddd896dad7bd66d9c96dafcc4311ce272447 (diff)
downloadgitlab-ce-add-csslab.tar.gz
Merge branch 'master' into add-csslabadd-csslab
Diffstat (limited to 'doc/development/ee_features.md')
-rw-r--r--doc/development/ee_features.md18
1 files changed, 3 insertions, 15 deletions
diff --git a/doc/development/ee_features.md b/doc/development/ee_features.md
index 1eb90c30ebd..fea92e740cb 100644
--- a/doc/development/ee_features.md
+++ b/doc/development/ee_features.md
@@ -360,27 +360,15 @@ Instead place EE specs in the `ee/spec` folder.
## JavaScript code in `assets/javascripts/`
-To separate EE-specific JS-files we can also move the files into an `ee` folder.
+To separate EE-specific JS-files we should also move the files into an `ee` folder.
For example there can be an
`app/assets/javascripts/protected_branches/protected_branches_bundle.js` and an
EE counterpart
`ee/app/assets/javascripts/protected_branches/protected_branches_bundle.js`.
-That way we can create a separate webpack bundle in `webpack.config.js`:
-
-```javascript
- protected_branches: '~/protected_branches',
- ee_protected_branches: 'ee/protected_branches/protected_branches_bundle.js',
-```
-
-With the separate bundle in place, we can decide which bundle to load inside the
-view, using the `page_specific_javascript_bundle_tag` helper.
-
-```haml
-- content_for :page_specific_javascripts do
- = page_specific_javascript_bundle_tag('protected_branches')
-```
+See the frontend guide [performance section](./fe_guide/performance.md) for
+information on managing page-specific javascript within EE.
## SCSS code in `assets/stylesheets`