Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-06-12 18:10:26 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-06-12 18:10:26 +0300
commitc0b17cee8be646588b14db49ad6d91b8cc818f97 (patch)
tree97287971303bccd649da1718c1a3a1ba8f345df6 /app/assets/javascripts/vue_merge_request_widget
parent8ef107c43390ea9c9932afb55d1318e4716fbf3b (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget')
-rw-r--r--app/assets/javascripts/vue_merge_request_widget/mixins/approvals.js10
1 files changed, 1 insertions, 9 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/mixins/approvals.js b/app/assets/javascripts/vue_merge_request_widget/mixins/approvals.js
index 3228c09c9b6..564e9321d54 100644
--- a/app/assets/javascripts/vue_merge_request_widget/mixins/approvals.js
+++ b/app/assets/javascripts/vue_merge_request_widget/mixins/approvals.js
@@ -39,7 +39,7 @@ export default {
};
},
skip() {
- return !this.mr?.id || !this.isRealtimeEnabled;
+ return !this.mr?.id;
},
updateQuery(
_,
@@ -63,14 +63,6 @@ export default {
disableCommittersApproval: false,
};
},
- computed: {
- isRealtimeEnabled() {
- // This mixin needs glFeatureFlagsMixin, but fatals if it's included here.
- // Parents that include this mixin (approvals) should also include the
- // glFeatureFlagsMixin mixin, or this will always be false.
- return Boolean(this.glFeatures?.realtimeApprovals);
- },
- },
methods: {
clearError() {
this.$emit('clearError');