Add latest changes from gitlab-org/gitlab@master
This commit is contained in:
GitLab Bot
parent
154cc38c02
commit
97d7aba1c6
|
|
@ -477,7 +477,7 @@ module Ci
|
|||
private
|
||||
|
||||
scope :with_upgrade_status, ->(upgrade_status) do
|
||||
Ci::Runner.joins(:runner_version).where(runner_version: { status: upgrade_status })
|
||||
joins(:runner_version).where(runner_version: { status: upgrade_status })
|
||||
end
|
||||
|
||||
EXECUTOR_NAME_TO_TYPES = {
|
||||
|
|
|
|||
|
|
@ -1,8 +0,0 @@
|
|||
---
|
||||
name: import_release_authors_from_github
|
||||
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/89692
|
||||
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/343448
|
||||
milestone: '15.1'
|
||||
type: development
|
||||
group: group::release
|
||||
default_enabled: true
|
||||
|
|
@ -2784,6 +2784,9 @@ which must be in the `$PATH`.
|
|||
If you use the [Docker executor](https://docs.gitlab.com/runner/executors/docker.html),
|
||||
you can use this image from the GitLab Container Registry: `registry.gitlab.com/gitlab-org/release-cli:latest`
|
||||
|
||||
If you use the [Shell executor](https://docs.gitlab.com/runner/executors/shell.html) or similar,
|
||||
[install `release-cli`](../../user/project/releases/release_cli.md) on the server where the runner is registered.
|
||||
|
||||
**Keyword type**: Job keyword. You can use it only as part of a job.
|
||||
|
||||
**Possible inputs**: The `release` subkeys:
|
||||
|
|
@ -2832,8 +2835,6 @@ This example creates a release:
|
|||
- The `release` section executes after the `script` keyword and before the `after_script`.
|
||||
- A release is created only if the job's main script succeeds.
|
||||
- If the release already exists, it is not updated and the job with the `release` keyword fails.
|
||||
- If you use the [Shell executor](https://docs.gitlab.com/runner/executors/shell.html) or similar,
|
||||
[install `release-cli`](../../user/project/releases/release_cli.md) on the server where the runner is registered.
|
||||
|
||||
**Related topics**:
|
||||
|
||||
|
|
|
|||
|
|
@ -71,13 +71,11 @@ Gradle 1.x projects are not supported. The minimum supported version of Maven is
|
|||
|------------|----------------------------------------------------------------------------------------------|-------|
|
||||
| JavaScript | [Bower](https://bower.io/), [npm](https://www.npmjs.com/) (7 and earlier) | |
|
||||
| Go | [Godep](https://github.com/tools/godep) ([deprecated](../../../update/deprecations.md#godep-support-in-license-compliance)), [go mod](https://github.com/golang/go/wiki/Modules) | |
|
||||
| Java | [Gradle](https://gradle.org/) <sup>1</sup>, [Maven](https://maven.apache.org/) | |
|
||||
| Java | [Gradle](https://gradle.org/), [Maven](https://maven.apache.org/) | |
|
||||
| .NET | [NuGet](https://www.nuget.org/) | The .NET Framework is supported via the [mono project](https://www.mono-project.com/). There are, however, some limitations. The scanner doesn't support Windows-specific dependencies and doesn't report dependencies of your project's listed dependencies. Also, the scanner always marks detected licenses for all dependencies as `unknown`. |
|
||||
| Python | [pip](https://pip.pypa.io/en/stable/) | Python is supported through [requirements.txt](https://pip.pypa.io/en/stable/user_guide/#requirements-files) and [Pipfile.lock](https://github.com/pypa/pipfile#pipfilelock). |
|
||||
| Ruby | [gem](https://rubygems.org/) | |
|
||||
|
||||
1. Gradle 7 and later is not supported as dependencies are not discovered when included with the `implementation` directive. Please see [GitLab#341222](https://gitlab.com/gitlab-org/gitlab/-/issues/341222) for more details.
|
||||
|
||||
### Experimental support
|
||||
|
||||
The following languages and package managers are [supported experimentally](https://github.com/pivotal/LicenseFinder#experimental-project-types).
|
||||
|
|
|
|||
|
|
@ -27,9 +27,10 @@ module Gitlab
|
|||
def build(release)
|
||||
existing_tags.add(release.tag_name)
|
||||
|
||||
build_hash = {
|
||||
{
|
||||
name: release.name,
|
||||
tag: release.tag_name,
|
||||
author_id: fetch_author_id(release),
|
||||
description: description_for(release),
|
||||
created_at: release.created_at,
|
||||
updated_at: release.created_at,
|
||||
|
|
@ -37,12 +38,6 @@ module Gitlab
|
|||
released_at: release.published_at || Time.current,
|
||||
project_id: project.id
|
||||
}
|
||||
|
||||
if Feature.enabled?(:import_release_authors_from_github, project)
|
||||
build_hash[:author_id] = fetch_author_id(release)
|
||||
end
|
||||
|
||||
build_hash
|
||||
end
|
||||
|
||||
def each_release
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@
|
|||
"@babel/preset-env": "^7.18.2",
|
||||
"@gitlab/at.js": "1.5.7",
|
||||
"@gitlab/favicon-overlay": "2.0.0",
|
||||
"@gitlab/svgs": "2.28.0",
|
||||
"@gitlab/svgs": "2.30.0",
|
||||
"@gitlab/ui": "42.22.1",
|
||||
"@gitlab/visual-review-tools": "1.7.3",
|
||||
"@rails/actioncable": "6.1.4-7",
|
||||
|
|
|
|||
|
|
@ -1801,5 +1801,15 @@ RSpec.describe Ci::Runner do
|
|||
is_expected.to contain_exactly(runner_14_1_0)
|
||||
end
|
||||
end
|
||||
|
||||
describe 'composed with other scopes' do
|
||||
subject { described_class.active(false).with_upgrade_status(:available) }
|
||||
|
||||
let(:inactive_runner_14_0_0) { create(:ci_runner, version: '14.0.0', active: false) }
|
||||
|
||||
it 'returns runner matching the composed scope' do
|
||||
is_expected.to contain_exactly(inactive_runner_14_0_0)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -1048,10 +1048,10 @@
|
|||
stylelint-declaration-strict-value "1.8.0"
|
||||
stylelint-scss "4.2.0"
|
||||
|
||||
"@gitlab/svgs@2.28.0":
|
||||
version "2.28.0"
|
||||
resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-2.28.0.tgz#a22ad2a4716db18af993d544a628d1d1f128aa7e"
|
||||
integrity sha512-V1CO91bcYVYuYiYrc6EV02BEzutp06SclzRtC6CRvGoz8mf+qEh7L25a7GxpJyW7hbLo+xajY+IJYhKNmB/qVg==
|
||||
"@gitlab/svgs@2.30.0":
|
||||
version "2.30.0"
|
||||
resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-2.30.0.tgz#bb73b2d16868b17e7e2dbb73653b7ab84f3cbd05"
|
||||
integrity sha512-XtYXba8XMAMHJz66H/lVZpXy77Z+ATlvbuvsR9cvM479lUEbrIcdAVOPV6zjPJiIxCUA5Yx1lUfWhgAwLEvRgw==
|
||||
|
||||
"@gitlab/ui@42.22.1":
|
||||
version "42.22.1"
|
||||
|
|
|
|||
Loading…
Reference in New Issue