diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-15 15:09:17 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-15 15:09:17 +0000 |
commit | 0d83264a7a24b33de933437355c77a4fe47e5419 (patch) | |
tree | ebf7a1d3274d918fb968d7056300cc388f2e91a4 /doc/development/ee_features.md | |
parent | b7c735c8ac11b8182807070fc6f84f2606e15427 (diff) | |
download | gitlab-ce-0d83264a7a24b33de933437355c77a4fe47e5419.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/development/ee_features.md')
-rw-r--r-- | doc/development/ee_features.md | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/doc/development/ee_features.md b/doc/development/ee_features.md index b386d0e78ff..bd70d5b87ba 100644 --- a/doc/development/ee_features.md +++ b/doc/development/ee_features.md @@ -9,7 +9,8 @@ ## Act as CE when unlicensed -Since the implementation of [GitLab CE features to work with unlicensed EE instance][ee-as-ce] +Since the implementation of +[GitLab CE features to work with unlicensed EE instance](https://gitlab.com/gitlab-org/gitlab/issues/2500) GitLab Enterprise Edition should work like GitLab Community Edition when no license is active. So EE features always should be guarded by `project.feature_available?` or `group.feature_available?` (or @@ -24,8 +25,6 @@ setting the [`FOSS_ONLY` environment variable](https://gitlab.com/gitlab-org/git to something that evaluates as `true`. The same works for running tests (for example `FOSS_ONLY=1 yarn jest`). -[ee-as-ce]: https://gitlab.com/gitlab-org/gitlab/issues/2500 - ## Separation of EE code All EE code should be put inside the `ee/` top-level directory. The @@ -53,11 +52,9 @@ is applied not only to models. Here's a list of other examples: - `ee/app/views/foo/_bar.html.haml` This works because for every path that is present in CE's eager-load/auto-load -paths, we add the same `ee/`-prepended path in [`config/application.rb`]. +paths, we add the same `ee/`-prepended path in [`config/application.rb`](https://gitlab.com/gitlab-org/gitlab/blob/925d3d4ebc7a2c72964ce97623ae41b8af12538d/config/application.rb#L42-52). This also applies to views. -[`config/application.rb`]: https://gitlab.com/gitlab-org/gitlab/blob/925d3d4ebc7a2c72964ce97623ae41b8af12538d/config/application.rb#L42-52 - ### EE features based on CE features For features that build on existing CE features, write a module in the `EE` |