Skip to content
Snippets Groups Projects

Fix Approval UI showing up for free plan

Merged Mark Chao requested to merge 9908-hide-approver-ui-in-free into master
All threads resolved!

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?

Edited by Mark Chao

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Reuben Pereira
  • Reuben Pereira
  • Reuben Pereira
  • Thanks @lulalala, I've left a few comments.

  • Mark Chao added 2 commits

    added 2 commits

    Compare with previous version

  • Paul Slaughter added 1 commit

    added 1 commit

    • bebf0712 - Cleanup has approvals available check in MR widget

    Compare with previous version

  • Paul Slaughter
  • Paul Slaughter
  • Paul Slaughter
  • @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 :thumbsup:

  • @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! :bow:

  • Mark Chao added 2 commits

    added 2 commits

    • 6793ad2b - Rename to approval_feature_available
    • 1218c47c - Hide approval path attributes if nil

    Compare with previous version

  • Author Maintainer

    @pslaughter yes leave it to me

  • Mark Chao added 2 commits

    added 2 commits

    Compare with previous version

  • Author Maintainer

    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

  • Author Maintainer

    Hi @wortschi, could you review the frontend part of this fix please? Thanks!

  • Thanks @lulalala, LGTM :thumbsup:

  • Mark Chao added 7 commits

    added 7 commits

    Compare with previous version

  • Author Maintainer

    Hi @godfat could you review the backend part please? Thanks! This particular fix was the one found by @wildjcrt

  • assigned to @godfat

  • Martin Wortschack
  • Martin Wortschack
  • Martin Wortschack
  • Martin Wortschack
  • Reuben Pereira mentioned in merge request !9830 (merged)

    mentioned in merge request !9830 (merged)

  • Mark Chao added 1 commit

    added 1 commit

    Compare with previous version

  • Mark Chao added 1 commit

    added 1 commit

    • ef1eead7 - Save query by using approval_feature_available?

    Compare with previous version

  • Lin Jen-Shin
  • @lulalala Thank you, looks great to me. Just one minor comment.

  • assigned to @lulalala

  • Author Maintainer

    Thanks @godfat. I've addressed it.

    Hi @iamphill, could you review the frontend please? Thanks!

  • assigned to @iamphill

  • @lulalala Did you push? I didn't see any changes?

  • Mark Chao added 1 commit

    added 1 commit

    • dde663c4 - Apply approval_feature_available? to approvals_before_merge

    Compare with previous version

  • Author Maintainer

    @godfat @@ my bad.

  • Lin Jen-Shin approved this merge request

    approved this merge request

  • No problems :)

  • Phil Hughes approved this merge request

    approved this merge request

  • Phil Hughes resolved all discussions

    resolved all discussions

  • Phil Hughes enabled an automatic merge when the pipeline for dde663c4 succeeds

    enabled an automatic merge when the pipeline for dde663c4 succeeds

  • LGTM :thumbsup:

    Enabled MWPS :thumbsup:

    @lulalala The milestone is 11.9 but there is a pick into 11.8 label? :thinking:

  • Tests are failing :disappointed:

  • assigned to @lulalala

  • Phil Hughes canceled the automatic merge

    canceled the automatic merge

  • Mark Chao marked the checklist item Conforms to the code review guidelines as completed

    marked the checklist item Conforms to the code review guidelines as completed

  • Mark Chao marked the checklist item Conforms to the merge request performance guidelines as completed

    marked the checklist item Conforms to the merge request performance guidelines as completed

  • Mark Chao marked the checklist item Conforms to the database guides as completed

    marked the checklist item Conforms to the database guides as completed

  • Mark Chao marked the checklist item EE specific content should be in the top level /ee folder as completed

    marked the checklist item EE specific content should be in the top level /ee folder as completed

  • Mark Chao added 379 commits

    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

    Compare with previous version

  • Author Maintainer

    @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

  • merged

  • Phil Hughes mentioned in commit 3fc64000

    mentioned in commit 3fc64000

  • Automatically picked into https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/9952, will merge into 11-8-stable-ee ready for 11.8.2-ee.

  • GitLab Release Tools Bot removed 1 deleted label

    removed 1 deleted label

  • Phil Hughes mentioned in commit 045a424c

    mentioned in commit 045a424c

  • mentioned in merge request !9952 (merged)

  • Mark Chao added 1 deleted label

    added 1 deleted label

  • This merge request could not automatically be picked into 11-8-stable-ee for 11.8.2-ee and will need manual intervention.

  • Mark Chao removed 1 deleted label

    removed 1 deleted label

  • Author Maintainer

    Sorry, I didn't realize this one has already been picked.

  • mentioned in issue #10750 (closed)

  • Please register or sign in to reply
    Loading