Skip to content

Docs: Merge Various EE /doc dirs to CE

Marcel Amirault requested to merge (removed):docs-repo-merge-29-misc into master

What does this MR do?

Ported to EE in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/12188.

This aligns various CE and EE docs dirs (with small diffs), as part of the effort to combine docs into a single codebase (&199 (closed))

This MR:

  • Brings in EE only files:
    • doc/articles/how_to_configure_ldap_gitlab_ee/index.md
    • doc/getting-started/subscription.md
    • doc/git_hooks/git_hooks.md
    • doc/install/ldap.md
    • doc/install/pivotal/index.md
    • doc/license/README.md
    • doc/subscriptions/billing_table.png
    • doc/subscriptions/index.md
    • doc/tools/email.md
    • doc/tools/email1.png
    • doc/tools/email2.png
  • Brings EE only information into:
    • doc/gitlab-basics/create-project.md
    • doc/install/requirements.md
    • doc/legal/corporate_contributor_license_agreement.md
    • doc/legal/individual_contributor_license_agreement.md
    • doc/raketasks/cleanup.md
    • doc/topics/authentication/index.md
    • doc/topics/autodevops/index.md
  • Brings in 2 images related to the docs above.
  • Updates relative links to absolute, adds badges, and fixes links as necessary.
  • Deletes one image no longer in use.

When both the EE Port and this MR are merged, the following docs dirs should hopefully be aligned between CE and EE:

  • doc/articles
  • doc/getting-started
  • doc/git_hooks
  • doc/gitlab-basics
  • doc/install
  • doc/legal
  • doc/license
  • doc/raketasks
  • doc/subscriptions
  • doc/tools
  • doc/topics

Then, please merge: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/12189, and the issue will be closed.

Related issues

Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/61362

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

  1. Review by assigned maintainer, who can always request/require the above reviews. Maintainer's review can occur before or after a technical writer review.
  2. Ensure a release milestone is set and that you merge the equivalent EE MR before the CE MR if both exist.
  3. If there has not been a technical writer review, create an issue for one using the Doc Review template.
Edited by Marcel Amirault

Merge request reports