Fix approvals section when merge requests disabled
What does this MR do?
This fixes a bug where the project edit page was fetching approval settings when merge requests were disabled.
Does this MR meet the acceptance criteria?
Conformity
-
Changelog entry -
Documentation created/updated or follow-up review issue created -
Code review guidelines -
Merge request performance guidelines -
Style guides -
Database guides -
Separation of EE specific content
Performance and testing
-
Review and add/update tests for this feature/bug. Consider all test levels. See the Test Planning Process.
Links
- Closes #11321 (closed)
Merge request reports
Activity
changed milestone to %11.11
added 1 commit
- f09b1c8b - Fix approvals section when merge requests disabled
marked the checklist item Changelog entry as completed
marked the checklist item Documentation created/updated or follow-up review issue created as completed
marked the checklist item Code review guidelines as completed
marked the checklist item Merge request performance guidelines as completed
marked the checklist item Style guides as completed
marked the checklist item Database guides as completed
marked the checklist item Separation of EE specific content as completed
marked the checklist item Review and add/update tests for this feature/bug. Consider all test levels. See the Test Planning Process. as completed
@reprazent, would you be able to review this small MR (mostly spec + a little HAML update)? Thank you!
assigned to @reprazent
- Resolved by Bob Van Landuyt
note: Added the ~"Pick into 11.10" label since the issue is labelled regression:11.10
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 Luke Bennett ( @lbennett
)Filipa Lacerda ( @filipa
)backend James Fargher ( @proglottis
)Grzegorz Bizon ( @grzesiek
)Generated by
DangerEdited by 🤖 GitLab Bot 🤖Thanks @pslaughter! Looks better than before!
@grzesiek Would you mind taking the maintainer review?
assigned to @grzesiek
added 181 commits
-
f09b1c8b...e51b3e49 - 180 commits from branch
master
- 1039b5b9 - Fix approvals section when merge requests disabled
-
f09b1c8b...e51b3e49 - 180 commits from branch
mentioned in commit bc2b3171
mentioned in issue gitlab-org/release/tasks#780 (closed)
@pslaughter This merge request could not automatically be picked into
11-10-stable-ee
for11.10.6-ee
and will need manual intervention. Please create a new MR targeting the source branch of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/13779, and assign to release managers.mentioned in merge request !13779 (merged)
mentioned in merge request !13920 (merged)
@pslaughter This merge request could not automatically be picked into
11-10-stable-ee
for11.10.7-ee
and will need manual intervention. Please create a new MR targeting the source branch of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14384, and assign to release managers.mentioned in merge request !14384 (merged)
Removing ~"Pick into 11.10" since it's already in
11-10-stable-ee
: https://gitlab.com/gitlab-org/gitlab-ee/commits/11-10-stable-ee#commit-70dbd7a5I believe this should've been removed when the backport was created: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/13920
/cc @pslaughter
I believe this should've been removed when the backport was created
Gah! You're right. Sorry about that
... Thanks for jumping on this @andr3added devopscreate label
added Enterprise Edition label