(Part 9) Multiple approval rules - docs with feature flag instruction
What does this MR do?
This MR updates the merge_request_approval
docs for the new "Multiple approval rules" feature. Please note that it points to a feature branch (not master
) and that the changes described in the docs are behind a feature flag (disabled for now).
Related issues
Part of #1979 (closed)
Author's checklist
-
Apply the correct labels and milestone -
Crosslink the document from the higher-level index -
Crosslink the document from other subject-related docs -
Feature moving tiers? Make sure the change is also reflected in features.yml
-
Correctly apply the product badges and tiers -
Port the MR to EE (or backport from CE): always recommended, required when the ee-compat-check
job fails
Review checklist
-
Your team's review (required) -
PM's review (recommended, but not a blocker) -
Technical writer's review (required) -
Merge the EE-MR first, CE-MR afterwards
Merge request reports
Activity
changed milestone to %11.8
added Create [DEPRECATED] approvals documentation labels
Hi @marcia, you have reviewed https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/9524 and merged it. However for some reason the merge was lost, so this is a MR to redo the changes.
I also added a
Note
on top of the doc, clarifying that the new feature will not be available to self-managed instances yet, and how the admin can enable them. So could you review that please?If anything needs modifying, please assign to @reprazent. Thanks!
mentioned in issue #9848 (closed)
added GitLab Premium + 1 deleted label
added 1 commit
- d1ea9493 - Add instructions on how to start a rails console
1 Warning a504e0fc: This commit’s subject line is acceptable, but please try to reduce it to 50 characters. 1 Message This merge request adds or changes files that require a review from the Docs team. Docs review
The following files require a review from the Documentation team:
doc/user/project/merge_requests/img/approvals_starter_project_edit.png
doc/user/project/merge_requests/img/approvals_starter_project_empty.png
doc/user/project/merge_requests/img/approvals_ultimate_mr_widget.png
doc/user/project/merge_requests/img/approvals_ultimate_project_edit.png
doc/user/project/merge_requests/img/approve.png
doc/user/project/merge_requests/img/approve_additionally.png
doc/user/project/merge_requests/img/remove_approval.png
doc/user/project/merge_requests/merge_request_approvals.md
When your content is ready for review, assign the MR to a technical writer according to the DevOps stages in the table below. If necessary, mention them in a comment explaining what needs to be reviewed.
Tech writer Stage(s) @marcia
~Create ~Release + development guidelines @axil
~Distribution ~Gitaly ~Gitter ~Monitor ~Package ~Secure @eread
~Manage ~Configure ~Geo ~Verify @mikelewis
~Plan You are welcome to mention them sooner if you have questions about writing or updating the documentation. GitLabbers are also welcome to use the #docs channel on Slack.
If you are not sure which category the change falls within, or the change is not part of one of these categories, mention one of the usernames above.
Reviewer roulette
Changes that require review have been detected! A merge request is normally reviewed by both a reviewer and a maintainer in its primary category (e.g. frontend or backend), and by a maintainer in all other categories.
To spread load more evenly across eligible reviewers, Danger has randomly picked a candidate for each review slot. Feel free to override this selection if you think someone else would be better-suited, or the chosen person is unavailable.
Once you've decided who will review this merge request, mention them as you normally would! Danger does not (yet?) automatically notify them for you.
Category Reviewer Maintainer ~Documentation Marcia Ramos ( @marcia
)Generated by
DangerEdited by 🤖 GitLab Bot 🤖@pslaughter do you know what happened with https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/9524?
@lulalala we merged into another feature branch, not into
master
. Maybe this was the problem?Anyway, should I go ahead and merge this?
Oh, @pslaughter is on vacations. @victorwu do you have an idea about it? Or could you pls point us to someone who has?
Maybe @reprazent?
- Resolved by Marcia Ramos
- Resolved by Marcia Ramos
- Resolved by Marcia Ramos
- Resolved by Marcia Ramos
- Resolved by Marcia Ramos
- Resolved by Marcia Ramos
assigned to @reprazent
I talked to @reprazent on Slack, we're good here, thanks @victorwu. @jramsay we should be okay.
assigned to @marcia
enabled an automatic merge when the pipeline for e7ec6795 succeeds
mentioned in commit 328f36f3
mentioned in merge request !9628 (merged)
@lulalala This MR could not be picked. Please set up an MR that targets
11-8-stable
directly and assign it to me. We will finalise RC9 (the last RC) in the next 3-4 hours.Edited by Yorick Petersementioned in issue gitlab-org/release/tasks#685 (closed)
assigned to @reprazent
mentioned in commit reprazent/gitlab-ee@e27cb8eb
mentioned in merge request !9629 (merged)
This was merged directly using https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/9629
10 11 Use these commands to start the Rails console: 12 13 ```sh 14 # Omnibus GitLab 15 gitlab-rails console 16 17 # Installation from source 18 cd /home/git/gitlab 19 sudo -u git -H bin/rails console RAILS_ENV=production 20 ``` 21 22 Then run `Feature.enable(:approval_rules)` to enable the feature flag. 23 24 The documentation for the older interface can be accessed 25 [here](/11.7/ee/user/project/merge_requests/merge_request_approvals.html). 2 2 3 3 > Introduced in [GitLab Enterprise Edition 7.12](https://about.gitlab.com/2015/06/22/gitlab-7-12-released/#merge-request-approvers-ee-only). 4 4 5 NOTE: **Note:** 6 If you are running a self-managed instance, the new interface shown on 7 this page will not be available unless the feature flag 8 `approval_rules` is enabled, which can be done from the Rails console by 9 instance administrators. added devopscreate label
added Enterprise Edition label
added typemaintenance label