diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-03-27 19:15:42 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-03-27 19:15:42 +0000 |
| commit | d352057333566b6104f881efcbe15d1cc9b21f40 (patch) | |
| tree | 4fe9c7326d83a0da58b184462abd90354c7d6fd1 /app/assets/javascripts/vue_merge_request_widget | |
| parent | 38c11bf84a13368193b502eaf928f9d19612d445 (diff) | |
| parent | 39e92fd851f3766b57310a2133a0eed814b17ae8 (diff) | |
| download | gitlab-ce-d352057333566b6104f881efcbe15d1cc9b21f40.tar.gz | |
Merge branch 'update-unresolved-discussions-vue-component' into 'master'
Add i18n and update specs for ShaMismatch vue component
See merge request gitlab-org/gitlab-ce!17870
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget')
| -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> |