diff options
| author | George Tsiolis <tsiolis.g@gmail.com> | 2018-03-19 18:13:49 +0200 |
|---|---|---|
| committer | George Tsiolis <tsiolis.g@gmail.com> | 2018-03-27 21:36:59 +0300 |
| commit | 39e92fd851f3766b57310a2133a0eed814b17ae8 (patch) | |
| tree | 6c529d55cea602e3ba55bbdb6cef3e6677575d6b /app | |
| parent | a520ab64db0ba9815627c197c60139d1a9a5c6d4 (diff) | |
| download | gitlab-ce-39e92fd851f3766b57310a2133a0eed814b17ae8.tar.gz | |
Add i18n and update specs for ShaMismatch vue component
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/states/sha_mismatch.vue | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/sha_mismatch.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/sha_mismatch.vue index 04100871a94..7cc07401911 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/sha_mismatch.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/sha_mismatch.vue @@ -17,8 +17,8 @@ export default { /> <div class="media-body space-children"> <span class="bold"> - The source branch HEAD has recently changed. - Please reload the page and review the changes before merging. + {{ s__(`mrWidget|The source branch HEAD has recently changed. +Please reload the page and review the changes before merging`) }} </span> </div> </div> |