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 2023-12-28 12:10:50 +00:00
parent 38b2e0d403
commit fdb0790ab5
13 changed files with 23 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab/CODEOWNERS
View File

@ -1232,7 +1232,7 @@ lib/gitlab/checks/**
/lib/tasks/tokens.rake
# Necessary for GitLab availability
[Verify] @gitlab-org/maintainers/cicd-verify @shinya.maeda @stanhu @ayufan
[Verify] @gitlab-org/maintainers/cicd-verify @stanhu @ayufan
# With these catch-all rules we will require backend approval and use it as an
# opportunity to refine specific rules defined in this section.
# Note that frontend, CI templates and other concerns should be kept within

1
.rubocop_todo/layout/line_end_string_concatenation_indentation.yml
View File

@ -293,7 +293,6 @@ Layout/LineEndStringConcatenationIndentation:
- 'spec/services/snippets/create_service_spec.rb'
- 'spec/services/users/email_verification/validate_token_service_spec.rb'
- 'spec/services/work_items/parent_links/create_service_spec.rb'
- 'spec/support/before_all_adapter.rb'
- 'spec/support/helpers/database/multiple_databases_helpers.rb'
- 'spec/support/helpers/redis_without_keys.rb'
- 'spec/support/matchers/have_gitlab_http_status.rb'

1
.rubocop_todo/style/inline_disable_annotation.yml
View File

@ -3153,7 +3153,6 @@ Style/InlineDisableAnnotation:
- 'spec/sidekiq/cron/job_gem_dependency_spec.rb'
- 'spec/sidekiq_cluster/sidekiq_cluster_spec.rb'
- 'spec/spec_helper.rb'
- 'spec/support/before_all_adapter.rb'
- 'spec/support/capybara.rb'
- 'spec/support/database/click_house/hooks.rb'
- 'spec/support/db_cleaner.rb'

1
.rubocop_todo/style/redundant_self.yml
View File

@ -384,4 +384,3 @@ Style/RedundantSelf:
- 'spec/lib/gitlab/background_task_spec.rb'
- 'spec/lib/gitlab/database/load_balancing_spec.rb'
- 'spec/models/integration_spec.rb'
- 'spec/support/before_all_adapter.rb'

2
app/models/integrations/apple_app_store.rb
View File

@ -45,7 +45,7 @@ module Integrations
section: SECTION_TYPE_CONFIGURATION,
title: -> { s_('AppleAppStore|Protected branches and tags only') },
description: -> { s_('AppleAppStore|Set variables on protected branches and tags only.') },
checkbox_label: -> { s_('AppleAppStore|Set variables on protected branches and tags only.') }
checkbox_label: -> { s_('AppleAppStore|Set variables on protected branches and tags only') }
def self.title
'Apple App Store Connect'

2
doc/user/project/integrations/google_play.md
View File

@ -34,7 +34,7 @@ To enable the Google Play integration in GitLab:
1. Select **Google Play**.
1. In **Enable integration**, select the **Active** checkbox.
1. In **Package name**, enter the package name of the app (for example, `com.gitlab.app_name`).
1. Optional. Under **Protected branches and tags only**, select the **Only set variables on protected branches and tags** checkbox.
1. Optional. Under **Protected branches and tags only**, select the **Set variables on protected branches and tags only** checkbox.
1. In **Service account key (.JSON)**, drag or upload your key file.
1. Optional. Select **Test settings**.
1. Select **Save changes**.

35
lib/sidebars/groups/menus/settings_menu.rb
View File

@ -6,32 +6,17 @@ module Sidebars
class SettingsMenu < ::Sidebars::Menu
override :configure_menu_items
def configure_menu_items
if can?(context.current_user, :admin_group, context.group)
add_item(general_menu_item)
add_item(integrations_menu_item)
add_item(access_tokens_menu_item)
add_item(group_projects_menu_item)
add_item(repository_menu_item)
add_item(ci_cd_menu_item)
add_item(applications_menu_item)
add_item(packages_and_registries_menu_item)
add_item(usage_quotas_menu_item)
return true
elsif Gitlab.ee? && can?(context.current_user, :change_push_rules, context.group)
# Push Rules are the only group setting that can also be edited by maintainers.
# Create an empty sub-menu here and EE adds Repository menu item (with only Push Rules).
return true
elsif Gitlab.ee? && can?(context.current_user, :read_billing, context.group)
# Billing is the only group setting that is visible to auditors.
# Create an empty sub-menu here and EE adds Settings menu item (with only Billing).
return true
elsif Gitlab.ee? && can?(context.current_user, :read_resource_access_tokens, context.group)
# Managing group acccess tokens is a custom ability independent of the access level.
# Create an empty sub-menu here and EE adds Settings menu item (with only Billing).
return true
end
return unless can?(context.current_user, :admin_group, context.group)
false
add_item(general_menu_item)
add_item(integrations_menu_item)
add_item(access_tokens_menu_item)
add_item(group_projects_menu_item)
add_item(repository_menu_item)
add_item(ci_cd_menu_item)
add_item(applications_menu_item)
add_item(packages_and_registries_menu_item)
add_item(usage_quotas_menu_item)
end
override :title

3
locale/gitlab.pot
View File

@ -5908,6 +5908,9 @@ msgstr ""
msgid "AppleAppStore|Protected branches and tags only"
msgstr ""
msgid "AppleAppStore|Set variables on protected branches and tags only"
msgstr ""
msgid "AppleAppStore|Set variables on protected branches and tags only."
msgstr ""

2
package.json
View File

@ -60,7 +60,7 @@
"@gitlab/favicon-overlay": "2.0.0",
"@gitlab/fonts": "^1.3.0",
"@gitlab/svgs": "3.74.0",
"@gitlab/ui": "^72.2.0",
"@gitlab/ui": "^72.3.0",
"@gitlab/visual-review-tools": "1.7.3",
"@gitlab/web-ide": "^0.0.1-dev-20231211152737",
"@mattiasbuelens/web-streams-adapter": "^0.1.0",

33
spec/support/before_all_adapter.rb
View File

@ -1,33 +0,0 @@
# frozen_string_literal: true
module TestProfBeforeAllAdapter
module MultipleDatabaseAdapter
def self.all_connection_classes
@all_connection_classes ||= [ActiveRecord::Base] + ActiveRecord::Base.descendants.select(&:connection_class?) # rubocop: disable Database/MultipleDatabases
end
def self.begin_transaction
self.all_connection_classes.each do |connection_class|
connection_class.connection.begin_transaction(joinable: false)
end
end
def self.rollback_transaction
self.all_connection_classes.each do |connection_class|
if connection_class.connection.open_transactions.zero?
warn "!!! before_all transaction has been already rollbacked and " \
"could work incorrectly"
next
end
connection_class.connection.rollback_transaction
end
end
end
def self.default_adapter
MultipleDatabaseAdapter
end
end
TestProf::BeforeAll.adapter = ::TestProfBeforeAllAdapter.default_adapter

2
spec/support/db_cleaner.rb
View File

@ -2,7 +2,7 @@
module DbCleaner
def all_connection_classes
::TestProfBeforeAllAdapter::MultipleDatabaseAdapter.all_connection_classes
::TestProf::BeforeAll::Adapters::ActiveRecord.all_connections.map(&:connection_class).uniq
end
def delete_from_all_tables!(except: [])

2
spec/support/helpers/database/multiple_databases_helpers.rb
View File

@ -85,7 +85,7 @@ module Database
# The usage of this method switches temporarily used `connection_handler`
# allowing full manipulation of ActiveRecord::Base connections without
# having side effects like:
# - misaligned transactions since this is managed by `BeforeAllAdapter`
# - misaligned transactions since this is managed by `TestProf::BeforeAll::Adapters::ActiveRecord`
# - removal of primary connections
#
# The execution within a block ensures safe cleanup of all allocated resources.

8
yarn.lock
View File

@ -1274,10 +1274,10 @@
resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-3.74.0.tgz#b6b41be65b9e70378c0cef0435f96edd5467e759"
integrity sha512-eHoywPSLrYb+I/IYGapei2Tum5vLtgWkFxN0fxmUUAnBnxFSA+67aheI33kQVV3WjANuZGkglfPBX3QAmN8BLA==
"@gitlab/ui@^72.2.0":
version "72.2.0"
resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-72.2.0.tgz#cd62b672559e441347dab6b0f0fb13ac60c4ca7c"
integrity sha512-FLse33QYS5yN14m7j4FsIiw9RLLxYLa6sbugVAcoERp+gPHVq7r6MeUFDa99SPhDDuerxItcwSwIGRtQyLfVMw==
"@gitlab/ui@^72.3.0":
version "72.3.0"
resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-72.3.0.tgz#8c5ab2f5ab3386c2a9b2800f498677e486133754"
integrity sha512-E8Fbi9PAdy1UEdnyv2kO4997MINkp17PRCNpRvgzIYgiGCZsfiuFab4q2m3UOLe29z25neiTKk5YYABrpQLxWg==
dependencies:
"@floating-ui/dom" "1.2.9"
bootstrap-vue "2.23.1"