VladPolskiy/gitlab-foss
1
0
Fork 0
mirror of https://gitlab.com/gitlab-org/gitlab-foss.git synced 2025-07-25 16:03:48 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Update from merge request

Browse Source
This commit is contained in:
root
2025-07-18 07:00:35 +00:00
parent f50eb2487d
commit 40739da9dc
7 changed files with 12 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -599,7 +599,7 @@ group :test do
# Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527
gem 'derailed_benchmarks', require: false, feature_category: :shared
gem 'gitlab_quality-test_tooling', '~> 2.10.0', require: false, feature_category: :tooling
gem 'gitlab_quality-test_tooling', '~> 2.16.0', require: false, feature_category: :tooling
end
gem 'octokit', '~> 9.0', feature_category: :importers

2
Gemfile.checksum
View File

@ -242,7 +242,7 @@
{"name":"gitlab-styles","version":"13.1.0","platform":"ruby","checksum":"46c7c5729616355868b7b40a4ffcd052b36346076042abe8cafaee1688cbf2c1"},
{"name":"gitlab_chronic_duration","version":"0.12.0","platform":"ruby","checksum":"0d766944d415b5c831f176871ee8625783fc0c5bfbef2d79a3a616f207ffc16d"},
{"name":"gitlab_omniauth-ldap","version":"2.2.0","platform":"ruby","checksum":"bb4d20acb3b123ed654a8f6a47d3fac673ece7ed0b6992edb92dca14bad2838c"},
{"name":"gitlab_quality-test_tooling","version":"2.10.0","platform":"ruby","checksum":"68e518f71d85981bdc096d8dbd3369c85f54a2fb9d3115a0b90ef9f14c845017"},
{"name":"gitlab_quality-test_tooling","version":"2.16.0","platform":"ruby","checksum":"af2647945594b5a7b74e2ffb6f221bd9e251457a4e05767ee36bc3e9dc21f0d6"},
{"name":"globalid","version":"1.1.0","platform":"ruby","checksum":"b337e1746f0c8cb0a6c918234b03a1ddeb4966206ce288fbb57779f59b2d154f"},
{"name":"gon","version":"6.4.0","platform":"ruby","checksum":"e3a618d659392890f1aa7db420f17c75fd7d35aeb5f8fe003697d02c4b88d2f0"},
{"name":"google-apis-androidpublisher_v3","version":"0.34.0","platform":"ruby","checksum":"d7e1d7dd92f79c498fe2082222a1740d788e022e660c135564b3fd299cab5425"},

8
Gemfile.lock
View File

@ -813,17 +813,17 @@ GEM
omniauth (>= 1.3, < 3)
pyu-ruby-sasl (>= 0.0.3.3, < 0.1)
rubyntlm (~> 0.5)
gitlab_quality-test_tooling (2.10.0)
gitlab_quality-test_tooling (2.16.0)
activesupport (>= 7.0, < 7.3)
amatch (~> 0.4.1)
fog-google (~> 1.24, >= 1.24.1)
gitlab (>= 4.19, < 6.0)
gitlab (>= 4.19, < 7.0)
http (~> 5.0)
influxdb-client (~> 3.1)
nokogiri (~> 1.10)
parallel (>= 1, < 2)
rainbow (>= 3, < 4)
rspec-parameterized (~> 1.0.0)
rspec-parameterized (>= 1.0, < 3.0)
table_print (= 1.5.7)
zeitwerk (>= 2, < 3)
globalid (1.1.0)
@ -2181,7 +2181,7 @@ DEPENDENCIES
gitlab-utils!
gitlab_chronic_duration (~> 0.12)
gitlab_omniauth-ldap (~> 2.2.0)
gitlab_quality-test_tooling (~> 2.10.0)
gitlab_quality-test_tooling (~> 2.16.0)
gon (~> 6.4.0)
google-apis-androidpublisher_v3 (~> 0.34.0)
google-apis-cloudbilling_v1 (~> 0.22.0)

2
Gemfile.next.checksum
View File

@ -242,7 +242,7 @@
{"name":"gitlab-styles","version":"13.1.0","platform":"ruby","checksum":"46c7c5729616355868b7b40a4ffcd052b36346076042abe8cafaee1688cbf2c1"},
{"name":"gitlab_chronic_duration","version":"0.12.0","platform":"ruby","checksum":"0d766944d415b5c831f176871ee8625783fc0c5bfbef2d79a3a616f207ffc16d"},
{"name":"gitlab_omniauth-ldap","version":"2.2.0","platform":"ruby","checksum":"bb4d20acb3b123ed654a8f6a47d3fac673ece7ed0b6992edb92dca14bad2838c"},
{"name":"gitlab_quality-test_tooling","version":"2.10.0","platform":"ruby","checksum":"68e518f71d85981bdc096d8dbd3369c85f54a2fb9d3115a0b90ef9f14c845017"},
{"name":"gitlab_quality-test_tooling","version":"2.16.0","platform":"ruby","checksum":"af2647945594b5a7b74e2ffb6f221bd9e251457a4e05767ee36bc3e9dc21f0d6"},
{"name":"globalid","version":"1.1.0","platform":"ruby","checksum":"b337e1746f0c8cb0a6c918234b03a1ddeb4966206ce288fbb57779f59b2d154f"},
{"name":"gon","version":"6.4.0","platform":"ruby","checksum":"e3a618d659392890f1aa7db420f17c75fd7d35aeb5f8fe003697d02c4b88d2f0"},
{"name":"google-apis-androidpublisher_v3","version":"0.34.0","platform":"ruby","checksum":"d7e1d7dd92f79c498fe2082222a1740d788e022e660c135564b3fd299cab5425"},

8
Gemfile.next.lock
View File

@ -807,17 +807,17 @@ GEM
omniauth (>= 1.3, < 3)
pyu-ruby-sasl (>= 0.0.3.3, < 0.1)
rubyntlm (~> 0.5)
gitlab_quality-test_tooling (2.10.0)
gitlab_quality-test_tooling (2.16.0)
activesupport (>= 7.0, < 7.3)
amatch (~> 0.4.1)
fog-google (~> 1.24, >= 1.24.1)
gitlab (>= 4.19, < 6.0)
gitlab (>= 4.19, < 7.0)
http (~> 5.0)
influxdb-client (~> 3.1)
nokogiri (~> 1.10)
parallel (>= 1, < 2)
rainbow (>= 3, < 4)
rspec-parameterized (~> 1.0.0)
rspec-parameterized (>= 1.0, < 3.0)
table_print (= 1.5.7)
zeitwerk (>= 2, < 3)
globalid (1.1.0)
@ -2176,7 +2176,7 @@ DEPENDENCIES
gitlab-utils!
gitlab_chronic_duration (~> 0.12)
gitlab_omniauth-ldap (~> 2.2.0)
gitlab_quality-test_tooling (~> 2.10.0)
gitlab_quality-test_tooling (~> 2.16.0)
gon (~> 6.4.0)
google-apis-androidpublisher_v3 (~> 0.34.0)
google-apis-cloudbilling_v1 (~> 0.22.0)

2
app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue
View File

@ -136,7 +136,7 @@ export default {
return `@${this.user?.username}`;
},
cssClasses() {
const classList = ['user-popover', 'gl-max-w-48', 'gl-overflow-hidden'];
const classList = ['user-popover', 'gl-w-34', 'gl-overflow-hidden'];
if (this.userCannotMerge) {
classList.push('user-popover-cannot-merge');

15
app/assets/stylesheets/components/avatar.scss
View File

@ -189,21 +189,6 @@ $avatar-sizes: (
}
.user-popover {
// GlAvatarLabeled doesn't expose any prop to override internal classes
// Max width of popover container is set by gl-max-w-48
// so we need to ensure that name/username/status container doesn't overflow
// stylelint-disable-next-line gitlab/no-gl-class
.gl-avatar-labeled-labels {
max-width: px-to-rem(290px);
}
// stylelint-disable-next-line gitlab/no-gl-class
.gl-avatar-labeled-label,
.gl-avatar-labeled-sublabel {
@apply gl-truncate;
}
&.user-popover-cannot-merge {
.popover-header {
background-color: var(--gl-feedback-warning-background-color);