Commit graph

16 commits

Author SHA1 Message Date
Tim Zallmann
be1523c1ba Merge branch 'add-documentation-about-backporting-changes' into 'master'
Add documentation about backporting changes from EE to CE

See merge request gitlab-org/gitlab-ce!18003
2018-04-03 13:42:24 +00:00
Rémy Coutable
160d29b869 Merge branch '44752-remove-ee-specific-comments' into 'master'
Remove EE-specific comment markers from CE

Closes #44752

See merge request gitlab-org/gitlab-ce!18054
2018-03-28 18:12:20 +00:00
Eric Eastwood
d5f0d89f9d Remove EE-specific comments from CE 2018-03-28 11:05:14 -05:00
Rémy Coutable
78f3ac085d Merge branch 'docs-extract-ee-api' into 'master'
Document a few strategies to extract EE APIs

See merge request gitlab-org/gitlab-ce!17573
2018-03-28 14:40:05 +00:00
André Luís
1dc43af6ff Add doc about backporting changes from EE to CE 2018-03-26 17:46:03 +00:00
Lin Jen-Shin
77d1f73ec1 Clarify what rules we should follow for naming 2018-03-26 15:42:19 +08:00
Robert Speicher
378d0c49e8 Copyedit doc/development/ee_features.md 2018-03-23 16:52:20 -05:00
Mike Greiling
06a07e1288
update EE features frontend section to point to performance.md for info on page-specific EE code 2018-03-12 15:51:52 -05:00
Lin Jen-Shin
65650bc0be Document a few strategies to extract EE APIs 2018-03-07 01:10:55 +08:00
Rémy Coutable
ad8cd349e7
Document the ee-files-location-check CI job
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-03-01 13:08:57 +01:00
Rémy Coutable
2bdb578032
Port some RuboCop and doc changes from EE
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-02-13 16:33:00 +01:00
Lin Jen-Shin
fd54d7a2b6 Add some more docs to doc/development/utilities.md 2018-01-12 19:44:00 +08:00
Lin Jen-Shin
8139895b43 Use Gitlab::Utils::Override over defined?(super) 2017-12-26 17:18:10 +08:00
Rémy Coutable
dd0223f530
Address Robert's and Axil's feedback
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-12-06 16:30:03 +01:00
Rémy Coutable
aaf1699730
Move the "Limit conflicts with EE" doc to "Automatic CE-> EE merge"
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-12-05 17:49:49 +01:00
Lin Jen-Shin
8acb6b7680 Merging EE doc into CE 2017-10-27 22:29:36 +08:00