diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-20 14:10:13 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-20 14:10:13 +0300 |
| commit | 0ea3fcec397b69815975647f5e2aa5fe944a8486 (patch) | |
| tree | 7979381b89d26011bcf9bdc989a40fcc2f1ed4ff /app/assets/javascripts/merge_conflicts/merge_conflict_resolver_app.vue | |
| parent | 72123183a20411a36d607d70b12d57c484394c8e (diff) | |
Add latest changes from gitlab-org/gitlab@15-1-stable-eev15.1.0-rc42
Diffstat (limited to 'app/assets/javascripts/merge_conflicts/merge_conflict_resolver_app.vue')
| -rw-r--r-- | app/assets/javascripts/merge_conflicts/merge_conflict_resolver_app.vue | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/merge_conflicts/merge_conflict_resolver_app.vue b/app/assets/javascripts/merge_conflicts/merge_conflict_resolver_app.vue index fdcb99351a7..20ee9a17fa0 100644 --- a/app/assets/javascripts/merge_conflicts/merge_conflict_resolver_app.vue +++ b/app/assets/javascripts/merge_conflicts/merge_conflict_resolver_app.vue @@ -31,7 +31,7 @@ export default { }, inject: ['mergeRequestPath', 'sourceBranchPath', 'resolveConflictsPath'], i18n: { - commitStatSummary: __('Showing %{conflict} between %{sourceBranch} and %{targetBranch}'), + commitStatSummary: __('Showing %{conflict}'), resolveInfo: __( 'You can resolve the merge conflict using either the Interactive mode, by choosing %{use_ours} or %{use_theirs} buttons, or by editing the files directly. Commit these changes into %{branch_name}', ), @@ -73,7 +73,7 @@ export default { </script> <template> <div id="conflicts"> - <gl-loading-icon v-if="isLoading" size="md" data-testid="loading-spinner" /> + <gl-loading-icon v-if="isLoading" size="lg" data-testid="loading-spinner" /> <div v-if="hasError" class="nothing-here-block"> {{ conflictsData.errorMessage }} </div> |