diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-03 18:08:08 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-03 18:08:08 +0300 |
| commit | 946771d0b016ae92b15a60bc3290a33b94191ffe (patch) | |
| tree | 64862c2433989483f5fce45d5539242577a362eb /app/assets/javascripts | |
| parent | f1e2fca19a90a6992c2020cf8c2159cfb0b61bca (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts')
| -rw-r--r-- | app/assets/javascripts/repository/components/last_commit.vue | 4 | ||||
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff_viewer.vue | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/assets/javascripts/repository/components/last_commit.vue b/app/assets/javascripts/repository/components/last_commit.vue index 64003630271..71c3e15ba49 100644 --- a/app/assets/javascripts/repository/components/last_commit.vue +++ b/app/assets/javascripts/repository/components/last_commit.vue @@ -71,8 +71,8 @@ export default { }, computed: { statusTitle() { - return sprintf(s__('Commits|Commit: %{commitText}'), { - commitText: this.commit.pipeline.detailedStatus.text, + return sprintf(s__('PipelineStatusTooltip|Pipeline: %{ciStatus}'), { + ciStatus: this.commit.pipeline.detailedStatus.text, }); }, isLoading() { diff --git a/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff_viewer.vue b/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff_viewer.vue index e30871b66fc..6f5a133b225 100644 --- a/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff_viewer.vue +++ b/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff_viewer.vue @@ -112,6 +112,7 @@ export default { <div class="image"> <image-viewer :path="imagePath" + :file-size="isNew ? newSize : oldSize" :inner-css-classes="[ 'frame', { |