Skip to content
代码片段 群组 项目
提交 3464e3d3 编辑于 作者: Andrew Fontaine's avatar Andrew Fontaine
浏览文件

Merge branch 'ph/393328/fixMrWidgetBlockingState' into 'master'

Fixes a bug where blocked state in widget would not show

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/113071



Merged-by: default avatarAndrew Fontaine <afontaine@gitlab.com>
Approved-by: default avatarAndrew Fontaine <afontaine@gitlab.com>
Co-authored-by: default avatarPhil Hughes <me@iamphill.com>
No related branches found
No related tags found
无相关合并请求
......@@ -79,7 +79,7 @@ export default class MergeRequestStore extends CEMergeRequestStore {
setApprovals(data) {
super.setApprovals(data);
this.approvalsLeft = data.approvalsRequired - data.approvedBy.nodes.length !== 0;
this.approvalsLeft = data.approvalsLeft;
this.preventMerge = !this.isApproved;
this.setState();
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册