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

Add latest changes from gitlab-org/gitlab@master

Browse Source
This commit is contained in:
GitLab Bot
2025-06-16 00:07:28 +00:00
parent 6bc2663bb0
commit 1adf8f6f3a
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/user/application_security/dependency_scanning/dependency_scanning_sbom/_index.md
View File

@ -346,7 +346,7 @@ build:
stage: build stage: build
script: script:
- mvn install - mvn install
- mvn dependency:tree -DoutputType=json -DoutputFile=maven.graph.json - mvn org.apache.maven.plugins:maven-dependency-plugin:3.8.1:tree -DoutputType=json -DoutputFile=maven.graph.json
# Collect all maven.graph.json artifacts and pass them onto jobs # Collect all maven.graph.json artifacts and pass them onto jobs
# in sequential stages. # in sequential stages.
artifacts: artifacts:

2
spec/lib/gitlab/gitaly_client_spec.rb
View File

@ -644,7 +644,7 @@ RSpec.describe Gitlab::GitalyClient, feature_category: :gitaly do
expect(kword_args[:metadata][:deadline_type]).to be_nil expect(kword_args[:metadata][:deadline_type]).to be_nil
end end
it 'includes only the deadline specified by the timeout when there was no deadline' do it 'includes only the deadline specified by the timeout when there was no deadline', quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/524657' do
allow(Gitlab::RequestContext.instance).to receive(:request_deadline).and_return(nil) allow(Gitlab::RequestContext.instance).to receive(:request_deadline).and_return(nil)
kword_args = described_class.request_kwargs('default', timeout: 6.hours.to_i) kword_args = described_class.request_kwargs('default', timeout: 6.hours.to_i)