Skip to content
Snippets Groups Projects
Commit 2bb0d089 authored by Kushal Pandya's avatar Kushal Pandya
Browse files

Merge branch '44698-recaptcha' into 'master'

Prevent unload when Recaptcha is open

Closes #44698

See merge request gitlab-org/gitlab-ce!24625
parents 6b67eb5b 704167db
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -10,6 +10,7 @@ import descriptionComponent from './description.vue';
import editedComponent from './edited.vue';
import formComponent from './form.vue';
import recaptchaModalImplementor from '../../vue_shared/mixins/recaptcha_modal_implementor';
import { __ } from '~/locale';
 
export default {
components: {
Loading
Loading
@@ -201,8 +202,8 @@ export default {
methods: {
handleBeforeUnloadEvent(e) {
const event = e;
if (this.showForm && this.issueChanged) {
event.returnValue = 'Are you sure you want to lose your issue information?';
if (this.showForm && this.issueChanged && !this.showRecaptcha) {
event.returnValue = __('Are you sure you want to lose your issue information?');
}
return undefined;
},
Loading
Loading
---
title: Prevent unload when Recaptcha is open
merge_request: 24625
author:
type: fixed
Loading
Loading
@@ -717,6 +717,9 @@ msgstr ""
msgid "Are you sure you want to lose unsaved changes?"
msgstr ""
 
msgid "Are you sure you want to lose your issue information?"
msgstr ""
msgid "Are you sure you want to regenerate the public key? You will have to update the public key on the remote server before mirroring will work again."
msgstr ""
 
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment