diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 11:18:50 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 11:18:50 +0000 |
| commit | 8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781 (patch) | |
| tree | a77e7fe7a93de11213032ed4ab1f33a3db51b738 /app/assets/javascripts/repository | |
| parent | 00b35af3db1abfe813a778f643dad221aad51fca (diff) | |
| download | gitlab-ce-8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-1-stable-ee
Diffstat (limited to 'app/assets/javascripts/repository')
3 files changed, 7 insertions, 4 deletions
diff --git a/app/assets/javascripts/repository/components/last_commit.vue b/app/assets/javascripts/repository/components/last_commit.vue index 010fc9a5d1a..c5c99d56e2a 100644 --- a/app/assets/javascripts/repository/components/last_commit.vue +++ b/app/assets/javascripts/repository/components/last_commit.vue @@ -149,7 +149,7 @@ export default { <pre v-if="commit.description" :class="{ 'd-block': showDescription }" - class="commit-row-description append-bottom-8" + class="commit-row-description gl-mb-3" >{{ commit.description }}</pre > </div> diff --git a/app/assets/javascripts/repository/components/table/row.vue b/app/assets/javascripts/repository/components/table/row.vue index 34424121390..d5363016335 100644 --- a/app/assets/javascripts/repository/components/table/row.vue +++ b/app/assets/javascripts/repository/components/table/row.vue @@ -147,8 +147,11 @@ export default { class="mr-1 position-relative text-secondary" /><span class="position-relative">{{ fullPath }}</span> </component> - <!-- eslint-disable-next-line @gitlab/vue-require-i18n-strings --> - <gl-badge v-if="lfsOid" variant="default" class="label-lfs ml-1">LFS</gl-badge> + <!-- eslint-disable @gitlab/vue-require-i18n-strings --> + <gl-badge v-if="lfsOid" variant="muted" size="sm" class="ml-1" data-qa-selector="label-lfs" + >LFS</gl-badge + > + <!-- eslint-enable @gitlab/vue-require-i18n-strings --> <template v-if="isSubmodule"> @ <gl-link :href="submoduleTreeUrl" class="commit-sha">{{ shortSha }}</gl-link> </template> diff --git a/app/assets/javascripts/repository/queries/getVueFileListLfsBadge.query.graphql b/app/assets/javascripts/repository/queries/getVueFileListLfsBadge.query.graphql index 3c3d14881da..eb21c1e73d8 100644 --- a/app/assets/javascripts/repository/queries/getVueFileListLfsBadge.query.graphql +++ b/app/assets/javascripts/repository/queries/getVueFileListLfsBadge.query.graphql @@ -1,3 +1,3 @@ -query getProjectShortPath { +query getVueFileListLfsBadge { vueFileListLfsBadge @client } |