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>2022-08-31 18:12:39 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2022-08-31 18:12:39 +0300
commit19044caf6695065ff64e26355e830dbdc6719e54 (patch)
tree5b9bdf081ab28d873cee38a5036f143a300ba733 /app/assets/javascripts/batch_comments
parent3034c7e6aa99d21c3d9fa1df01f60fdd3f32d914 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/batch_comments')
-rw-r--r--app/assets/javascripts/batch_comments/components/submit_dropdown.vue7
1 files changed, 5 insertions, 2 deletions
diff --git a/app/assets/javascripts/batch_comments/components/submit_dropdown.vue b/app/assets/javascripts/batch_comments/components/submit_dropdown.vue
index c5b713b5447..acc3cbe10a0 100644
--- a/app/assets/javascripts/batch_comments/components/submit_dropdown.vue
+++ b/app/assets/javascripts/batch_comments/components/submit_dropdown.vue
@@ -82,8 +82,11 @@ export default {
this.autosave.reset();
- if (window.mrTabs && this.note) {
- window.location.hash = `note_${this.getCurrentUserLastNote.id}`;
+ if (window.mrTabs && (this.noteData.note || this.noteData.approve)) {
+ if (this.noteData.note) {
+ window.location.hash = `note_${this.getCurrentUserLastNote.id}`;
+ }
+
window.mrTabs.tabShown('show');
setTimeout(() =>