summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/vue_merge_request_widget/i18n.js
diff options
context:
space:
mode:
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget/i18n.js')
-rw-r--r--app/assets/javascripts/vue_merge_request_widget/i18n.js5
1 files changed, 5 insertions, 0 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/i18n.js b/app/assets/javascripts/vue_merge_request_widget/i18n.js
index e8e522a01e9..c88e795e5f3 100644
--- a/app/assets/javascripts/vue_merge_request_widget/i18n.js
+++ b/app/assets/javascripts/vue_merge_request_widget/i18n.js
@@ -5,3 +5,8 @@ export const SQUASH_BEFORE_MERGE = {
checkboxLabel: __('Squash commits'),
helpLabel: __('What is squashing?'),
};
+
+export const I18N_SHA_MISMATCH = {
+ warningMessage: __('Merge blocked: new changes were just added.'),
+ actionButtonLabel: __('Review changes'),
+};