Commit 7f12487a authored by Toon Claes's avatar Toon Claes Committed by Toon Claes

Fix the internal links

parent b0e37d92
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
## Act as CE when unlicensed ## 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][ee-as-ce]
GitLab Enterprise Edition should work like GitLab Community Edition GitLab Enterprise Edition should work like GitLab Community Edition
when no license is active. This means the code should work like it when no license is active. This means the code should work like it
does in CE when `License.feature_available?(:some_feature)` returns does in CE when `License.feature_available?(:some_feature)` returns
...@@ -19,6 +19,9 @@ This means, if possible, CE specs should remain untouched and extra ...@@ -19,6 +19,9 @@ This means, if possible, CE specs should remain untouched and extra
specs should be added for EE, stubbing the licensed feature using the specs should be added for EE, stubbing the licensed feature using the
spec helper `stub_licensed_features` in `EE::LicenseHelpers`. spec helper `stub_licensed_features` in `EE::LicenseHelpers`.
[ee-as-ce]: https://gitlab.com/gitlab-org/gitlab-ee/issues/2500
## Separation of EE code ## Separation of EE code
Merging changes from GitLab CE to EE can result in numerous conflicts. Merging changes from GitLab CE to EE can result in numerous conflicts.
...@@ -159,9 +162,12 @@ def levels_for_user(user = nil) ...@@ -159,9 +162,12 @@ def levels_for_user(user = nil)
end end
``` ```
See [CE MR](ce-mr-full-private) and [EE MR](ee-mr-full-private) for See [CE MR][ce-mr-full-private] and [EE MR][ee-mr-full-private] for
full implementation details. full implementation details.
[ce-mr-full-private]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12373
[ee-mr-full-private]: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2199
### Code in `app/controllers/` ### Code in `app/controllers/`
In controllers, the most common type of conflict is with `before_action` that In controllers, the most common type of conflict is with `before_action` that
...@@ -239,8 +245,3 @@ Instead add a file in a `/ee/` sub-folder. ...@@ -239,8 +245,3 @@ Instead add a file in a `/ee/` sub-folder.
When doing this, rubocop might complain about the path not When doing this, rubocop might complain about the path not
matching. So on the top-level `describe` append `# rubocop:disable matching. So on the top-level `describe` append `# rubocop:disable
RSpec/FilePath` to disable the cop for that line. RSpec/FilePath` to disable the cop for that line.
[ee-as-ce]: https://gitlab.com/gitlab-org/gitlab-ee/issues/2500
[ee-features-list]: https://gitlab.com/gitlab-com/www-gitlab-com/blob/master/data/features.yml
[ce-mr-full-private]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12373
[ee-mr-full-private]: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2199
...@@ -4,7 +4,7 @@ This guide contains best-practices for avoiding conflicts between CE and EE. ...@@ -4,7 +4,7 @@ This guide contains best-practices for avoiding conflicts between CE and EE.
## Implementing EE feature ## Implementing EE feature
Follow the [guidelines](ee_features) on how to implement a EE feature. Follow the [guidelines](ee_features.md) on how to implement a EE feature.
## Daily CE Upstream merge ## Daily CE Upstream merge
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment