Skip to content

G
gitlab-ce
Commit cdd0dd50 authored by Alfredo Sumaran's avatar Alfredo Sumaran
Browse files
Options

Fix discard message

parent edd30976
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
app/views/projects/merge_requests/conflicts/components/_diff_file_editor.html.haml
View file @ cdd0dd50
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
.diff-editor-wrap{ "v-show" => "file.showEditor" } .diff-editor-wrap{ "v-show" => "file.showEditor" }
.discard-changes-alert-wrap{ "v-if" => "file.promptDiscardConfirmation" } .discard-changes-alert-wrap{ "v-if" => "file.promptDiscardConfirmation" }
.discard-changes-alert .discard-changes-alert
Are you sure to discard your changes? Are you sure you want to discard your changes?
.discard-actions .discard-actions
%button.btn.btn-sm.btn-close{ "@click" => "acceptDiscardConfirmation(file)" } Discard changes %button.btn.btn-sm.btn-close{ "@click" => "acceptDiscardConfirmation(file)" } Discard changes
%button.btn.btn-sm{ "@click" => "cancelDiscardConfirmation(file)" } Cancel %button.btn.btn-sm{ "@click" => "cancelDiscardConfirmation(file)" } Cancel
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7