root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Add latest changes from gitlab-org/gitlab@master

This commit is contained in:
GitLab Bot 2024-12-21 03:37:29 +00:00
parent 8bf1146557
commit c7a79c4f96
4 changed files with 44 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/assets/javascripts/repository/components/table/row.vue
View File

@ -5,6 +5,7 @@ import {
GlLink, GlLink,
GlSkeletonLoader, GlSkeletonLoader,
GlTooltipDirective, GlTooltipDirective,
GlTruncate,
GlLoadingIcon, GlLoadingIcon,
GlIcon, GlIcon,
GlHoverLoadDirective, GlHoverLoadDirective,
@ -28,6 +29,7 @@ export default {
GlSkeletonLoader, GlSkeletonLoader,
GlLoadingIcon, GlLoadingIcon,
GlIcon, GlIcon,
GlTruncate,
TimeagoTooltip, TimeagoTooltip,
FileIcon, FileIcon,
GlIntersectionObserver, GlIntersectionObserver,
@ -207,7 +209,7 @@ export default {
<template> <template>
<tr class="tree-item"> <tr class="tree-item">
<td class="tree-item-file-name cursor-default position-relative"> <td class="tree-item-file-name gl-relative gl-flex gl-cursor-default gl-gap-2">
<component <component
:is="linkComponent" :is="linkComponent"
ref="link" ref="link"
@ -218,7 +220,7 @@ export default {
:class="{ :class="{
'is-submodule': isSubmodule, 'is-submodule': isSubmodule,
}" }"
class="tree-item-link str-truncated" class="tree-item-link gl-inline-flex gl-min-w-0"
data-testid="file-name-link" data-testid="file-name-link"
> >
<file-icon <file-icon
@ -227,12 +229,17 @@ export default {
:folder="isFolder" :folder="isFolder"
:submodule="isSubmodule" :submodule="isSubmodule"
:loading="path === loadingPath" :loading="path === loadingPath"
css-classes="position-relative file-icon" css-classes="gl-relative file-icon"
class="gl-relative gl-mr-2 gl-text-subtle" class="gl-relative gl-mr-2 gl-text-secondary"
/><span class="gl-relative">{{ fullPath }}</span> /><gl-truncate
:text="fullPath"
position="end"
class="gl-min-w-0 gl-grow hover:gl-underline"
with-tooltip
/>
</component> </component>
<!-- eslint-disable @gitlab/vue-require-i18n-strings --> <!-- eslint-disable @gitlab/vue-require-i18n-strings -->
<gl-badge v-if="lfsOid" variant="muted" class="gl-ml-2" data-testid="label-lfs">LFS</gl-badge> <gl-badge v-if="lfsOid" variant="muted" data-testid="label-lfs">LFS</gl-badge>
<!-- eslint-enable @gitlab/vue-require-i18n-strings --> <!-- eslint-enable @gitlab/vue-require-i18n-strings -->
<template v-if="isSubmodule"> <template v-if="isSubmodule">
@ <gl-link :href="submoduleTreeUrl" class="commit-sha">{{ shortSha }}</gl-link> @ <gl-link :href="submoduleTreeUrl" class="commit-sha">{{ shortSha }}</gl-link>
@ -243,7 +250,6 @@ export default {
:title="commitData.lockLabel" :title="commitData.lockLabel"
name="lock" name="lock"
:size="12" :size="12"
class="gl-ml-2"
/> />
</td> </td>
<td class="tree-commit cursor-default gl-hidden sm:gl-table-cell"> <td class="tree-commit cursor-default gl-hidden sm:gl-table-cell">

3
locale/gitlab.pot
View File

@ -51458,9 +51458,6 @@ msgstr ""
msgid "SecurityOrchestration|more than %{allowed}" msgid "SecurityOrchestration|more than %{allowed}"
msgstr "" msgstr ""
msgid "SecurityOrchestration|or from:"
msgstr ""
msgid "SecurityOrchestration|projects with compliance frameworks" msgid "SecurityOrchestration|projects with compliance frameworks"
msgstr "" msgstr ""

2
spec/features/projects/files/files_sort_submodules_with_folders_spec.rb
View File

@ -18,7 +18,7 @@ RSpec.describe 'Projects > Files > User views files page', feature_category: :so
folders = tree.trees.map(&:name) folders = tree.trees.map(&:name)
files = tree.blobs.map(&:name) files = tree.blobs.map(&:name)
submodules = tree.submodules.map do |submodule| submodules = tree.submodules.map do |submodule|
submodule.name + " @ " + submodule.id[0..7] "#{submodule.name}\n@\n#{submodule.id[0..7]}"
end end
sorted_titles = (folders + submodules).sort + files sorted_titles = (folders + submodules).sort + files

60
spec/frontend/repository/components/table/__snapshots__/row_spec.js.snap
View File

@ -5,29 +5,29 @@ exports[`Repository table row component renders a symlink table row 1`] = `
class="tree-item" class="tree-item"
> >
<td <td
class="cursor-default position-relative tree-item-file-name" class="gl-cursor-default gl-flex gl-gap-2 gl-relative tree-item-file-name"
> >
<a <a
class="str-truncated tree-item-link" class="gl-inline-flex gl-min-w-0 tree-item-link"
data-testid="file-name-link" data-testid="file-name-link"
href="https://test.com" href="https://test.com"
title="test" title="test"
> >
<file-icon-stub <file-icon-stub
class="gl-mr-2 gl-relative gl-text-subtle" class="gl-mr-2 gl-relative gl-text-secondary"
cssclasses="position-relative file-icon" cssclasses="gl-relative file-icon"
filemode="120000" filemode="120000"
filename="test" filename="test"
size="16" size="16"
/> />
<span <gl-truncate-stub
class="gl-relative" class="gl-grow gl-min-w-0 hover:gl-underline"
> position="end"
test text="test"
</span> withtooltip="true"
/>
</a> </a>
<gl-icon-stub <gl-icon-stub
class="gl-ml-2"
name="lock" name="lock"
size="12" size="12"
title="Locked by Root" title="Locked by Root"
@ -62,29 +62,29 @@ exports[`Repository table row component renders table row 1`] = `
class="tree-item" class="tree-item"
> >
<td <td
class="cursor-default position-relative tree-item-file-name" class="gl-cursor-default gl-flex gl-gap-2 gl-relative tree-item-file-name"
> >
<a <a
class="str-truncated tree-item-link" class="gl-inline-flex gl-min-w-0 tree-item-link"
data-testid="file-name-link" data-testid="file-name-link"
href="https://test.com" href="https://test.com"
title="test" title="test"
> >
<file-icon-stub <file-icon-stub
class="gl-mr-2 gl-relative gl-text-subtle" class="gl-mr-2 gl-relative gl-text-secondary"
cssclasses="position-relative file-icon" cssclasses="gl-relative file-icon"
filemode="" filemode=""
filename="test" filename="test"
size="16" size="16"
/> />
<span <gl-truncate-stub
class="gl-relative" class="gl-grow gl-min-w-0 hover:gl-underline"
> position="end"
test text="test"
</span> withtooltip="true"
/>
</a> </a>
<gl-icon-stub <gl-icon-stub
class="gl-ml-2"
name="lock" name="lock"
size="12" size="12"
title="Locked by Root" title="Locked by Root"
@ -119,29 +119,29 @@ exports[`Repository table row component renders table row for path with special
class="tree-item" class="tree-item"
> >
<td <td
class="cursor-default position-relative tree-item-file-name" class="gl-cursor-default gl-flex gl-gap-2 gl-relative tree-item-file-name"
> >
<a <a
class="str-truncated tree-item-link" class="gl-inline-flex gl-min-w-0 tree-item-link"
data-testid="file-name-link" data-testid="file-name-link"
href="https://test.com" href="https://test.com"
title="test" title="test"
> >
<file-icon-stub <file-icon-stub
class="gl-mr-2 gl-relative gl-text-subtle" class="gl-mr-2 gl-relative gl-text-secondary"
cssclasses="position-relative file-icon" cssclasses="gl-relative file-icon"
filemode="" filemode=""
filename="test" filename="test"
size="16" size="16"
/> />
<span <gl-truncate-stub
class="gl-relative" class="gl-grow gl-min-w-0 hover:gl-underline"
> position="end"
test text="test"
</span> withtooltip="true"
/>
</a> </a>
<gl-icon-stub <gl-icon-stub
class="gl-ml-2"
name="lock" name="lock"
size="12" size="12"
title="Locked by Root" title="Locked by Root"