Skip to content

Docs: Merge EE doc/​workflow to CE

Marcel Amirault requested to merge (removed):docs-repo-merge-4-workflow into master

What does this MR do?

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

This aligns the CE and EE workflow 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, notifications.md, shortcuts.md and todos.md.
  • Brings in:
    • doc/workflow/ff_merge.md
    • doc/workflow/git_annex.md
    • doc/workflow/git_lfs.md
    • doc/workflow/issue_weight.md
    • doc/workflow/issue_weight/issue.png
    • doc/workflow/lfs/images/git-annex-branches.png
    • doc/workflow/lfs/migrate_from_git_annex_to_git_lfs.md
    • doc/workflow/merge_request_approvals.md
    • doc/workflow/rebase_before_merge.md
  • Adds badges to references to EE features (no more than once per section).
  • Deletes doc/workflow/rebase_request_widget.png from EE, as it is orphaned and no longer used, and it is not ported to CE.
  • Updates a link and an anchor in user/project/issues/issue_data_and_actions.md

When both the EE Port and this MR are merged, the doc/workflow docs should hopefully be aligned between CE and EE.

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

Related issues

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

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