Fix Approval UI showing up for free plan
What does this MR do?
Approval related UI are showing for free plan projects in
- MR edit page
- MR show page widget
This MR hides those UI elements for free plan projects.
What are the relevant issue numbers?
Closes #9908 (closed)
Does this MR meet the acceptance criteria?
-
Changelog entry added, if necessary -
Documentation created/updated via this MR -
Documentation reviewed by technical writer or follow-up review issue created -
Tests added for this feature/bug -
Tested in all supported browsers -
Conforms to the code review guidelines -
Conforms to the merge request performance guidelines -
Conforms to the style guides -
Conforms to the database guides -
Link to e2e tests MR added if this MR has Requires e2e tests label. See the Test Planning Process. -
EE specific content should be in the top level /ee
folder -
For a paid feature, have we considered GitLab.com plans, how it works for groups, and is there a design for promoting it to users who aren't on the correct plan?
Merge request reports
Activity
changed milestone to %11.9
added Create [DEPRECATED] approvals backend devopscreate priority2 regression:11.0 severity2 typebug + 1 deleted label
Hi @pslaughter, could you see what's the best way to hide the approval widget if
merge_request_approvers
feature is not available to the project? I've added amerge_request_approvers_available
attribute to the entity. Thanks!assigned to @pslaughter
marked the checklist item Changelog entry added, if necessary as completed
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 frontend Sam Beckham ( @samdbeckham
)Filipa Lacerda ( @filipa
)backend Michael Kozono ( @mkozono
)Kamil Trzciński ( @ayufan
)Generated by
DangerEdited by 🤖 GitLab Bot 🤖Hi @rpereira2 would you be able to do a preliminary review please? Thanks!
- Resolved by Reuben Pereira
- Resolved by Reuben Pereira
- Resolved by Reuben Pereira
- Resolved by Reuben Pereira
Thanks @lulalala, I've left a few comments.
added 1 commit
- bebf0712 - Cleanup has approvals available check in MR widget
- Resolved by Mark Chao
- Resolved by Phil Hughes
- Resolved by Phil Hughes
@lulalala, thanks for the ping! I left some details in the commit message and this MR. Check it out and feel free to ping me if you have any questions
assigned to @lulalala
@lulalala, I may have caused some small pipeline issues... Do you mind resolving it? If you need me to hop on it, just let me know. Thanks!
added 2 commits
@pslaughter yes leave it to me
Hi @rpereira2 we made a little more changes, and I tried your suggestions, but the
stub_licensed_features
didn't work out. So I'll leave it for now. Could you see if the new changes are fine? Thanks!assigned to @rpereira2
Hi @wortschi, could you review the frontend part of this fix please? Thanks!
Thanks @lulalala, LGTM
assigned to @wortschi
assigned to @godfat
- Resolved by Martin Wortschack
- Resolved by Martin Wortschack
- Resolved by Martin Wortschack
- Resolved by Martin Wortschack
FE changes look good to me! Just left one question in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/9819#note_147326814
mentioned in merge request !9830 (merged)
added 1 commit
- ef1eead7 - Save query by using approval_feature_available?
- Resolved by Mark Chao
@lulalala Thank you, looks great to me. Just one minor comment.
assigned to @lulalala
assigned to @iamphill
@lulalala Did you push? I didn't see any changes?
added 1 commit
- dde663c4 - Apply approval_feature_available? to approvals_before_merge
@godfat @@ my bad.
enabled an automatic merge when the pipeline for dde663c4 succeeds
assigned to @lulalala
marked the checklist item Conforms to the code review guidelines as completed
marked the checklist item Conforms to the merge request performance guidelines as completed
marked the checklist item Conforms to the database guides as completed
added 379 commits
-
dde663c4...195940f9 - 376 commits from branch
master
- 502d4014 - Fix MR approval form showing in free plan
- f150b0ee - Hide rules when approval feature is unavailable
- 1ca1c452 - Cleanup has approvals available check in MR widget
Toggle commit list-
dde663c4...195940f9 - 376 commits from branch
@iamphill I've fixed the backend spec. The ee-check spec probably needs to be ignored as it is changing the json schema with ee element. I am a little unsure about the jest spec, but I've rebased against the latest master, hopefully it would go away.
assigned to @iamphill
mentioned in commit 3fc64000
mentioned in issue gitlab-org/release/tasks#700 (closed)
Automatically picked into https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/9952, will merge into
11-8-stable-ee
ready for11.8.2-ee
.mentioned in commit 045a424c
mentioned in merge request !9952 (merged)
mentioned in issue #10750 (closed)
added Enterprise Edition label
mentioned in issue #27426 (closed)