diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-10-12 22:52:44 -0500 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-10-13 14:16:35 -0500 |
| commit | cdd0dd507d1d5a226f1f438c4bfa602a115caac3 (patch) | |
| tree | e2c2f396fbedb27f0d97810e5081937805b9d7fa /app/views/projects/merge_requests | |
| parent | edd30976bd8069a02e0674ee36d1455c06ea751f (diff) | |
| download | gitlab-ce-cdd0dd507d1d5a226f1f438c4bfa602a115caac3.tar.gz | |
Fix discard message
Diffstat (limited to 'app/views/projects/merge_requests')
| -rw-r--r-- | app/views/projects/merge_requests/conflicts/components/_diff_file_editor.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/conflicts/components/_diff_file_editor.html.haml b/app/views/projects/merge_requests/conflicts/components/_diff_file_editor.html.haml index 943ae6ee129..3c927d362c2 100644 --- a/app/views/projects/merge_requests/conflicts/components/_diff_file_editor.html.haml +++ b/app/views/projects/merge_requests/conflicts/components/_diff_file_editor.html.haml @@ -2,7 +2,7 @@ .diff-editor-wrap{ "v-show" => "file.showEditor" } .discard-changes-alert-wrap{ "v-if" => "file.promptDiscardConfirmation" } .discard-changes-alert - Are you sure to discard your changes? + Are you sure you want to discard your changes? .discard-actions %button.btn.btn-sm.btn-close{ "@click" => "acceptDiscardConfirmation(file)" } Discard changes %button.btn.btn-sm{ "@click" => "cancelDiscardConfirmation(file)" } Cancel |