- | Java and Kotlin (not Android)1 |
+ Java and Kotlin1 |
8 LTS,
11 LTS,
@@ -237,7 +237,7 @@ The following languages and dependency managers are supported:
- Support for Kotlin projects for Android is tracked in issue 336866.
+ Android is supported when DS_EXPERIMENTAL_GRADLE_BUILTIN_PARSER is set to true.
diff --git a/doc/user/gitlab_com/index.md b/doc/user/gitlab_com/index.md
index 59a2e68d730..2b691402b57 100644
--- a/doc/user/gitlab_com/index.md
+++ b/doc/user/gitlab_com/index.md
@@ -124,6 +124,8 @@ Groups are permanently deleted after a seven-day delay.
If you are on the Free tier, your groups are immediately deleted, and you will not be able to restore them.
+You can [view and restore groups marked for deletion](../../user/group/index.md#restore-a-group).
+
## Delayed project deletion
DETAILS:
@@ -136,6 +138,8 @@ Projects are permanently deleted after a seven-day delay.
If you are on the Free tier, your projects are immediately deleted, and you will not be able to restore them.
+You can [view and restore projects marked for deletion](../../user/project/working_with_projects.md#restore-a-project).
+
## Inactive project deletion
[Inactive project deletion](../../administration/inactive_project_deletion.md) is disabled on GitLab.com.
diff --git a/gems/gitlab-housekeeper/bin/gitlab-housekeeper b/gems/gitlab-housekeeper/bin/gitlab-housekeeper
index e81508b859d..fb169d33761 100755
--- a/gems/gitlab-housekeeper/bin/gitlab-housekeeper
+++ b/gems/gitlab-housekeeper/bin/gitlab-housekeeper
@@ -8,6 +8,10 @@ options = {}
OptionParser.new do |opts|
opts.banner = 'Creates merge requests that can be inferred from the current state of the codebase'
+ opts.on('-b=BRANCH', '--target-branch=BRANCH', String, 'Target branch to use. Defaults to master.') do |branch|
+ options[:target_branch] = branch
+ end
+
opts.on('-m=M', '--max-mrs=M', Integer, 'Limit of MRs to create. Defaults to 1.') do |m|
options[:max_mrs] = m
end
diff --git a/gems/gitlab-housekeeper/lib/gitlab/housekeeper/runner.rb b/gems/gitlab-housekeeper/lib/gitlab/housekeeper/runner.rb
index bd3624b5620..e1ba91db146 100644
--- a/gems/gitlab-housekeeper/lib/gitlab/housekeeper/runner.rb
+++ b/gems/gitlab-housekeeper/lib/gitlab/housekeeper/runner.rb
@@ -13,10 +13,11 @@ require 'digest'
module Gitlab
module Housekeeper
class Runner
- def initialize(max_mrs: 1, dry_run: false, keeps: nil, filter_identifiers: [])
+ def initialize(max_mrs: 1, dry_run: false, keeps: nil, filter_identifiers: [], target_branch: 'master')
@max_mrs = max_mrs
@dry_run = dry_run
@logger = Logger.new($stdout)
+ @target_branch = target_branch
require_keeps
@keeps = if keeps
@@ -95,7 +96,7 @@ module Gitlab
end
def git
- @git ||= ::Gitlab::Housekeeper::Git.new(logger: @logger)
+ @git ||= ::Gitlab::Housekeeper::Git.new(logger: @logger, branch_from: @target_branch)
end
def require_keeps
@@ -127,7 +128,7 @@ module Gitlab
end
puts '=> Diff:'
- puts Shell.execute('git', '--no-pager', 'diff', '--color=always', 'master', branch_name, '--',
+ puts Shell.execute('git', '--no-pager', 'diff', '--color=always', @target_branch, branch_name, '--',
*change.changed_files)
puts
end
@@ -136,7 +137,7 @@ module Gitlab
non_housekeeper_changes = gitlab_client.non_housekeeper_changes(
source_project_id: housekeeper_fork_project_id,
source_branch: branch_name,
- target_branch: 'master',
+ target_branch: @target_branch,
target_project_id: housekeeper_target_project_id
)
@@ -146,7 +147,7 @@ module Gitlab
change: change,
source_project_id: housekeeper_fork_project_id,
source_branch: branch_name,
- target_branch: 'master',
+ target_branch: @target_branch,
target_project_id: housekeeper_target_project_id,
update_title: !non_housekeeper_changes.include?(:title),
update_description: !non_housekeeper_changes.include?(:description),
@@ -159,7 +160,7 @@ module Gitlab
gitlab_client.get_existing_merge_request(
source_project_id: housekeeper_fork_project_id,
source_branch: branch_name,
- target_branch: 'master',
+ target_branch: @target_branch,
target_project_id: housekeeper_target_project_id
)
end
diff --git a/gems/gitlab-housekeeper/spec/gitlab/housekeeper/runner_spec.rb b/gems/gitlab-housekeeper/spec/gitlab/housekeeper/runner_spec.rb
index d0b7521879a..d223ea7c654 100644
--- a/gems/gitlab-housekeeper/spec/gitlab/housekeeper/runner_spec.rb
+++ b/gems/gitlab-housekeeper/spec/gitlab/housekeeper/runner_spec.rb
@@ -135,6 +135,36 @@ RSpec.describe ::Gitlab::Housekeeper::Runner do
expect(change2.keep_class).to eq(fake_keep)
end
+ context 'when given target_branch' do
+ it 'branches from that target branch' do
+ # Branches get created
+ expect(::Gitlab::Housekeeper::Git).to receive(:new)
+ .with(logger: anything, branch_from: 'the-target-branch')
+ .and_return(git)
+
+ # Branches get shown and pushed
+ expect(::Gitlab::Housekeeper::Shell).to receive(:execute)
+ .with('git', '--no-pager', 'diff', '--color=always', 'the-target-branch',
+ 'the-identifier-for-the-first-change', '--', 'change1.txt', 'change2.txt')
+
+ # Merge requests get created
+ expect(gitlab_client).to receive(:create_or_update_merge_request)
+ .with(
+ change: change1,
+ source_project_id: '123',
+ source_branch: 'the-identifier-for-the-first-change',
+ target_branch: 'the-target-branch',
+ target_project_id: '456',
+ update_title: true,
+ update_description: true,
+ update_labels: true,
+ update_reviewers: true
+ ).twice.and_return({ 'web_url' => 'https://example.com' })
+
+ described_class.new(max_mrs: 1, keeps: [fake_keep], target_branch: 'the-target-branch').run
+ end
+ end
+
context 'when given filter_identifiers' do
it 'skips a change that does not match the filter_identifiers' do
# Branches get created
diff --git a/lib/gitlab/background_migration/fix_corrupted_scanner_ids_of_vulnerability_reads.rb b/lib/gitlab/background_migration/fix_corrupted_scanner_ids_of_vulnerability_reads.rb
new file mode 100644
index 00000000000..ad18e5bf182
--- /dev/null
+++ b/lib/gitlab/background_migration/fix_corrupted_scanner_ids_of_vulnerability_reads.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Gitlab
+ module BackgroundMigration
+ # This batched background migration is EE-only, see
+ # ee/lib/ee/gitlab/background_migration/fix_corrupted_scanner_ids_of_vulnerability_reads.rb
+ # for the actual migration code.
+ #
+ # This batched background migration will update any
+ # vulnerability_read that has a scanner_id that differs from the
+ # related vulnerability_occurrence.scanner_id. The
+ # vulnerability_occurrence.scanner_id is the correct value, so the
+ # mismatched vulnerability_read will be updated to the
+ # vulnerability_occurrence.scanner_id value
+ class FixCorruptedScannerIdsOfVulnerabilityReads < BatchedMigrationJob
+ feature_category :vulnerability_management
+
+ def perform; end
+ end
+ end
+end
+
+Gitlab::BackgroundMigration::FixCorruptedScannerIdsOfVulnerabilityReads.prepend_mod
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 407ce45b2fd..ba2bd605d69 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -24722,6 +24722,9 @@ msgstr ""
msgid "GroupSettings|After the instance reaches the user cap, any user who is added or requests access must be approved by an administrator. Leave empty for an unlimited user cap. If you change the user cap to unlimited, you must re-enable %{project_sharing_docs_link_start}project sharing%{link_end} and %{group_sharing_docs_link_start}group sharing%{link_end}. Increasing the user cap does not automatically approve pending users."
msgstr ""
+msgid "GroupSettings|Allow members of projects and groups to create runners with runner registration tokens"
+msgstr ""
+
msgid "GroupSettings|An experiment is a feature that is in the process of being developed. It is not production-ready. We encourage users to try experimental features and provide feedback. %{link_start}Learn more%{link_end}."
msgstr ""
@@ -24950,6 +24953,9 @@ msgstr ""
msgid "GroupSettings|What is Insights?"
msgstr ""
+msgid "GroupSettings|When disabled, members will not be able to register runners using runner registration tokens. They can instead use runner authentication tokens as a more secure runner registration method."
+msgstr ""
+
msgid "GroupSettings|When you enable any of these features, you accept the %{link_start}GitLab Testing Agreement%{link_end}."
msgstr ""
diff --git a/package.json b/package.json
index 1995c3419ce..24db0c10bf5 100644
--- a/package.json
+++ b/package.json
@@ -63,7 +63,7 @@
"@gitlab/favicon-overlay": "2.0.0",
"@gitlab/fonts": "^1.3.0",
"@gitlab/svgs": "3.95.0",
- "@gitlab/ui": "78.10.0",
+ "@gitlab/ui": "78.10.1",
"@gitlab/visual-review-tools": "1.7.3",
"@gitlab/web-ide": "^0.0.1-dev-20240226152102",
"@mattiasbuelens/web-streams-adapter": "^0.1.0",
diff --git a/qa/Gemfile b/qa/Gemfile
index 3753333a580..6d9145f98e6 100644
--- a/qa/Gemfile
+++ b/qa/Gemfile
@@ -9,7 +9,7 @@ gem 'activesupport', '~> 7.0.8.1' # This should stay in sync with the root's Gem
gem 'allure-rspec', '~> 2.24.2'
gem 'capybara', '~> 3.40.0'
gem 'capybara-screenshot', '~> 1.0.26'
-gem 'rake', '~> 13', '>= 13.2.0'
+gem 'rake', '~> 13', '>= 13.2.1'
gem 'rspec', '~> 3.13'
gem 'selenium-webdriver', '= 4.19.0'
gem 'airborne', '~> 0.3.7', require: false # airborne is messing with rspec sandboxed mode so not requiring by default
diff --git a/qa/Gemfile.lock b/qa/Gemfile.lock
index 883443f49e8..1f315e7c79e 100644
--- a/qa/Gemfile.lock
+++ b/qa/Gemfile.lock
@@ -251,7 +251,7 @@ GEM
rails-html-sanitizer (1.5.0)
loofah (~> 2.19, >= 2.19.1)
rainbow (3.1.1)
- rake (13.2.0)
+ rake (13.2.1)
regexp_parser (2.1.1)
representable (3.2.0)
declarative (< 0.1.0)
@@ -371,7 +371,7 @@ DEPENDENCIES
parallel_tests (~> 4.4)
pry-byebug (~> 3.10.1)
rainbow (~> 3.1.1)
- rake (~> 13, >= 13.2.0)
+ rake (~> 13, >= 13.2.1)
rest-client (~> 2.1.0)
rotp (~> 6.3.0)
rspec (~> 3.13)
diff --git a/qa/qa/runtime/env.rb b/qa/qa/runtime/env.rb
index 6e26a1c64dd..7c1d560d4cd 100644
--- a/qa/qa/runtime/env.rb
+++ b/qa/qa/runtime/env.rb
@@ -86,6 +86,10 @@ module QA
ENV['CI_PROJECT_NAME']
end
+ def ci_project_path
+ ENV['CI_PROJECT_PATH']
+ end
+
def schedule_type
ENV['SCHEDULE_TYPE']
end
diff --git a/qa/qa/service/docker_run/saml_idp.rb b/qa/qa/service/docker_run/saml_idp.rb
index c5bcd043a9c..a51ad5e7d69 100644
--- a/qa/qa/service/docker_run/saml_idp.rb
+++ b/qa/qa/service/docker_run/saml_idp.rb
@@ -97,7 +97,7 @@ module QA
config = ERB.new(read_fixture('saml', "#{AUTHSOURCES_FILENAME}.erb")).result(binding)
::File.write(config_path, config)
- config_path.gsub("/home/gitlab/qa", "/builds/gitlab-org/gitlab/qa")
+ config_path.gsub("/home/gitlab/qa", "/builds/#{File.join(Runtime::Env.ci_project_path, 'qa')}")
end
end
end
diff --git a/scripts/lint-doc.sh b/scripts/lint-doc.sh
index 53ebd087943..349731a0644 100755
--- a/scripts/lint-doc.sh
+++ b/scripts/lint-doc.sh
@@ -235,7 +235,7 @@ fi
# shellcheck disable=2059
printf "${COLOR_GREEN}INFO: Looking for Vale to lint prose, either installed locally or available in documentation linting image...${COLOR_RESET}\n"
-run_locally_or_in_container 'vale' "--minAlertLevel error --output=doc/.vale/vale.tmpl --glob=${MD_DOC_PATH}" 'doc'
+run_locally_or_in_container 'vale' "--minAlertLevel error --output=doc/.vale/vale.tmpl" "${MD_DOC_PATH}"
if [ "$ERRORCODE" -ne 0 ]
then
diff --git a/spec/frontend/group_settings/allow_runner_registration_token_toggle_spec.js b/spec/frontend/group_settings/allow_runner_registration_token_toggle_spec.js
new file mode 100644
index 00000000000..19678fc5741
--- /dev/null
+++ b/spec/frontend/group_settings/allow_runner_registration_token_toggle_spec.js
@@ -0,0 +1,79 @@
+import { initAllowRunnerRegistrationTokenToggle } from '~/group_settings/allow_runner_registration_token_toggle';
+
+import { setHTMLFixture, resetHTMLFixture } from 'helpers/fixtures';
+
+describe('initAllowRunnerRegistrationTokenToggle', () => {
+ let form;
+ let requestSubmitMock;
+
+ const setFormFixture = ({
+ action = '/settings',
+ hiddenInputValue = 'false',
+ toggleDisabled = 'false',
+ toggleIsChecked = 'false',
+ toggleLabel = 'Toggle Label',
+ } = {}) => {
+ setHTMLFixture(`
+
+ `);
+
+ initAllowRunnerRegistrationTokenToggle();
+
+ form = document.querySelector('form');
+ requestSubmitMock = jest.spyOn(form, 'requestSubmit').mockImplementation(() => {});
+ };
+
+ const findInput = () => form.querySelector('[name="group[allow_runner_registration_token]"]');
+ const findToggle = () => form.querySelector('[data-testid="toggle-wrapper"] button');
+
+ afterEach(() => {
+ resetHTMLFixture();
+ });
+
+ it('renders a toggle and hidden input', () => {
+ setFormFixture();
+
+ expect(form.textContent).toContain('Toggle Label');
+
+ expect(findToggle()).toBeDefined();
+ expect(findInput()).toBeDefined();
+ });
+
+ describe('when setting is enabled', () => {
+ beforeEach(() => {
+ setFormFixture({ hiddenInputValue: 'true', toggleIsChecked: 'true' });
+ });
+
+ it('shows an "on" toggle', () => {
+ expect(findInput().value).toBe('true');
+ expect(findToggle().getAttribute('aria-checked')).toBe('true');
+ });
+
+ it('when clicked, toggles the setting', () => {
+ findToggle().click();
+
+ expect(findInput().value).toBe('false');
+ expect(requestSubmitMock).toHaveBeenCalledTimes(1);
+ });
+ });
+ describe('when setting is disabled', () => {
+ beforeEach(() => {
+ setFormFixture({ hiddenInputValue: 'false', toggleIsChecked: 'false' });
+ });
+
+ it('shows an "off toggle"', () => {
+ expect(findInput().value).toBe('false');
+ expect(findToggle().getAttribute('aria-checked')).toBe('false');
+ });
+
+ it('when clicked, toggles the setting', () => {
+ findToggle().click();
+
+ expect(findInput().value).toBe('true');
+ expect(requestSubmitMock).toHaveBeenCalledTimes(1);
+ });
+ });
+});
diff --git a/spec/lib/gitlab/database/sharding_key_spec.rb b/spec/lib/gitlab/database/sharding_key_spec.rb
index ee03e7c3299..73b9bc125f2 100644
--- a/spec/lib/gitlab/database/sharding_key_spec.rb
+++ b/spec/lib/gitlab/database/sharding_key_spec.rb
@@ -217,6 +217,7 @@ RSpec.describe 'new tables missing sharding_key', feature_category: :cell do
def tables_missing_sharding_key(starting_from_milestone:)
::Gitlab::Database::Dictionary.entries.filter_map do |entry|
entry.table_name if entry.sharding_key.blank? &&
+ !entry.exempt_from_sharding? &&
entry.milestone_greater_than_or_equal_to?(starting_from_milestone) &&
::Gitlab::Database::GitlabSchema.cell_local?(entry.gitlab_schema)
end
diff --git a/spec/migrations/20240409023046_queue_fix_corrupted_scanner_ids_of_vulnerability_reads_spec.rb b/spec/migrations/20240409023046_queue_fix_corrupted_scanner_ids_of_vulnerability_reads_spec.rb
new file mode 100644
index 00000000000..c5e365e7079
--- /dev/null
+++ b/spec/migrations/20240409023046_queue_fix_corrupted_scanner_ids_of_vulnerability_reads_spec.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require_migration!
+
+RSpec.describe QueueFixCorruptedScannerIdsOfVulnerabilityReads, feature_category: :vulnerability_management do
+ let!(:batched_migration) { described_class::MIGRATION }
+
+ it 'schedules a new batched migration' do
+ reversible_migration do |migration|
+ migration.before -> {
+ expect(batched_migration).not_to have_scheduled_batched_migration
+ }
+
+ migration.after -> {
+ expect(batched_migration).to have_scheduled_batched_migration(
+ table_name: :vulnerability_reads,
+ column_name: :id,
+ interval: described_class::DELAY_INTERVAL,
+ batch_size: described_class::BATCH_SIZE,
+ sub_batch_size: described_class::SUB_BATCH_SIZE
+ )
+ }
+ end
+ end
+end
diff --git a/yarn.lock b/yarn.lock
index f9b49631962..cf1e1d4e5e4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1326,10 +1326,10 @@
resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-3.95.0.tgz#80b128efbfb7ad4a46d94ac97f0bc326433ed256"
integrity sha512-UQ91tQNRtsVnEoR/sd6Lk0dNZKLAIeTyadwg0BhW7i6KL7V9XN3UQkvoo4K1KIDwBSnOSm1WPEy4Xvm4Vx/60Q==
-"@gitlab/ui@78.10.0":
- version "78.10.0"
- resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-78.10.0.tgz#6859da363a880b98d6bfebd593a9ada6d46a2e83"
- integrity sha512-m3zIkbhTW69KLnrCQ4hvy/pcPcJ3YUEOpP9HMw3zLfKlYEZXy2y9RVbBGsa5lRfMJPmW+IuPvafEVCWqjUtXEA==
+"@gitlab/ui@78.10.1":
+ version "78.10.1"
+ resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-78.10.1.tgz#7f5dead96ad0ba26ad2e2fd50f4acf74b46999f6"
+ integrity sha512-H6tJ4UTUKn/LY1g7tRwKoV31fmDyr/MMW22r8dRDpwrhq2s4bBaT2SU8QKyQ9pvCUQvaOU67ogooBc8fkuOPLA==
dependencies:
"@floating-ui/dom" "1.4.3"
bootstrap-vue "2.23.1"
|