The source project of this merge request has been removed.
Docs: Merge EE doc/integration to CE
What does this MR do?
Ported to EE in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/11465
This aligns the CE and EE integration docs, as part of the effort to combine docs into a single codebase (&199 (closed)).
This MR (and the EE Port):
- Brings EE-only text into
readme.md
andsaml.md
. - Brings in
elasticsearch.md
,jenkins.md
,jenkins_deprecated.md
,jira_development_panel.md
andkerberos.md
from EE. - Brings in 7 Jira images and 2 elasticsearch (limit_namespace) related images from EE.
- For jenkins:
- 3 images were no longer in use anywhere in the project and were deleted from EE, and not ported to CE.
- 4 images were still in use, but saved in the wrong location. They were moved to
/img
and the image links updated, in both CE and EE.
- 4 images in
integration/ldap
were no longer in use, and they (and the dir) were deleted from EE and not ported to CE. - The markdown was incorrect in
saml.md
, so I corrected it by removing extra spaces in the ordered lists.
When both the EE Port and this MR are merged, the doc/integration
docs should hopefully be aligned between CE and EE.
Then, please merge: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/11865, and the issue will be closed.
Related issues
Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/59152
Author's checklist
-
Follow the Documentation Guidelines and Style Guide. -
Link docs to and from the higher-level index page, plus other related docs where helpful. -
Apply the ~Documentation label.
Review checklist
All reviewers can help ensure accuracy, clarity, completeness, and adherence to the Documentation Guidelines and Style Guide.
1. Primary Reviewer
-
Review by a code reviewer or other selected colleague to confirm accuracy, clarity, and completeness. This can be skipped for minor fixes without substantive content changes.
2. Technical Writer
-
Optional: Technical writer review. If not requested for this MR, must be scheduled post-merge. To request for this MR, assign the writer listed for the applicable DevOps stage.
3. Maintainer
-
Review by assigned maintainer, who can always request/require the above reviews. Maintainer's review can occur before or after a technical writer review. -
Ensure a release milestone is set and that you merge the equivalent EE MR before the CE MR if both exist. -
If there has not been a technical writer review, create an issue for one using the Doc Review template.
Edited by Marcel Amirault