Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
7f12487a
Commit
7f12487a
authored
Jun 26, 2017
by
Toon Claes
Committed by
Toon Claes
Aug 21, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix the internal links
parent
b0e37d92
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
8 deletions
+9
-8
doc/development/ee_features.md
doc/development/ee_features.md
+8
-7
doc/development/limit_ee_conflicts.md
doc/development/limit_ee_conflicts.md
+1
-1
No files found.
doc/development/ee_features.md
View file @
7f12487a
...
...
@@ -9,7 +9,7 @@
## 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
when no license is active. This means the code should work like it
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
specs should be added for EE, stubbing the licensed feature using the
spec helper
`stub_licensed_features`
in
`EE::LicenseHelpers`
.
[
ee-as-ce
]:
https://gitlab.com/gitlab-org/gitlab-ee/issues/2500
## Separation of EE code
Merging changes from GitLab CE to EE can result in numerous conflicts.
...
...
@@ -159,9 +162,12 @@ def levels_for_user(user = nil)
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.
[
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/`
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.
When doing this, rubocop might complain about the path not
matching. So on the top-level
`describe`
append
`# rubocop:disable
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
doc/development/limit_ee_conflicts.md
View file @
7f12487a
...
...
@@ -4,7 +4,7 @@ This guide contains best-practices for avoiding conflicts between CE and EE.
## 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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment