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 2024-09-27 15:14:20 +00:00
parent ddcef959ce
commit 5ba7c90d3a
41 changed files with 286 additions and 201 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.gitlab/ci/frontend.gitlab-ci.yml
View File

@ -286,16 +286,18 @@ jest-build-cache:
NODE_OPTIONS: --max-old-space-size=7680
allow_failure: true
.with-jest-build-cache-vue3-needs:
.with-jest-build-cache-vue3-ensure-compilable-sfcs-needs:
needs:
- job: jest-build-cache-vue3
- job: jest-build-cache-vue3-ensure-compilable-sfcs
optional: true
jest-build-cache-vue3:
jest-build-cache-vue3-ensure-compilable-sfcs:
extends:
- .vue3
# Make sure allow_failure is set by jest-build-cache rather than .vue3.
# Failures should not be allowed in merge requests.
- jest-build-cache
- .frontend:rules:jest
- .vue3
jest:
extends:
@ -338,7 +340,7 @@ jest vue3:
- .frontend:rules:jest-vue3-nightly
- .vue3
needs:
- !reference [.with-jest-build-cache-vue3-needs, needs]
- !reference [.with-jest-build-cache-vue3-ensure-compilable-sfcs-needs, needs]
jest-with-fixtures vue3:
extends:
@ -357,7 +359,7 @@ jest vue3 mr:
- .frontend:rules:jest
- .vue3
needs:
- !reference [.with-jest-build-cache-vue3-needs, needs]
- !reference [.with-jest-build-cache-vue3-ensure-compilable-sfcs-needs, needs]
artifacts:
name: vue3-mr-junit
expire_in: 31d
@ -374,7 +376,7 @@ jest-with-fixtures vue3 mr:
- jest vue3 mr
- .repo-from-artifacts
needs:
- !reference [.with-jest-build-cache-vue3-needs, needs]
- !reference [.with-jest-build-cache-vue3-ensure-compilable-sfcs-needs, needs]
# it's ok to wait for the repo artifact as we're waiting for the fixtures (which wait for the repo artifact) anyway
- !reference [.repo-from-artifacts, needs]
- !reference [.with-fixtures-needs, needs]
@ -418,6 +420,7 @@ jest vue3 predictive:
- "detect-tests"
script:
- if [[ -s "$RSPEC_CHANGED_FILES_PATH" ]] || [[ -s "$RSPEC_MATCHING_JS_FILES_PATH" ]]; then run_timed_command "yarn jest:ci:vue3-mr:predictive-without-fixtures"; fi
allow_failure: false
jest-with-fixtures vue3 predictive:
extends:
@ -428,6 +431,7 @@ jest-with-fixtures vue3 predictive:
- "detect-tests"
script:
- if [[ -s "$RSPEC_CHANGED_FILES_PATH" ]] || [[ -s "$RSPEC_MATCHING_JS_FILES_PATH" ]]; then run_timed_command "yarn jest:ci:vue3-mr:predictive-with-fixtures"; fi
allow_failure: false
jest-integration:
extends:

3
app/assets/javascripts/boards/components/board_content.vue
View File

@ -283,6 +283,9 @@ export default {
@setAddColumnFormVisibility="$emit('setAddColumnFormVisibility', $event)"
/>
</div>
</transition>
<transition mode="out-in" name="slide" @after-enter="afterFormEnters">
<board-add-new-column
v-if="addColumnFormVisible"
:board-id="boardId"

5
app/assets/javascripts/editor/schema/ci.json
View File

@ -196,7 +196,10 @@
},
"definitions": {
"artifacts": {
"type": "object",
"type": [
"object",
"null"
],
"markdownDescription": "Used to specify a list of files and directories that should be attached to the job if it succeeds. Artifacts are sent to Gitlab where they can be downloaded. [Learn More](https://docs.gitlab.com/ee/ci/yaml/#artifacts).",
"additionalProperties": false,
"properties": {

5
app/assets/stylesheets/page_bundles/oncall_schedules.scss
View File

@ -24,11 +24,6 @@
.gl-card {
min-width: 75%;
}
// stylelint-disable-next-line gitlab/no-gl-class
&.gl-modal .modal-md {
max-width: 640px;
}
}
//// Copied from roadmaps.scss - adapted for on-call schedules

4
app/controllers/concerns/onboarding/status.rb
View File

@ -2,6 +2,10 @@
module Onboarding
class Status
def self.registration_path_params(params:, extra_params: {}) # rubocop:disable Lint/UnusedMethodArgument -- overridden in EE
{}
end
def initialize(params, session, user)
@params = params
@session = session

2
app/controllers/omniauth_callbacks_controller.rb
View File

@ -200,7 +200,7 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
end
end
# Overrided in EE
# Overridden in EE
def set_session_active_since(id); end
def sign_in_user_flow(auth_user_class)

7
app/controllers/registrations_controller.rb
View File

@ -28,7 +28,7 @@ class RegistrationsController < Devise::RegistrationsController
feature_category :instance_resiliency
helper_method :arkose_labs_enabled?, :registration_path_params, :preregistration_tracking_label
helper_method :arkose_labs_enabled?, :preregistration_tracking_label
def new
@resource = build_resource
@ -156,11 +156,6 @@ class RegistrationsController < Devise::RegistrationsController
user.blocked_pending_approval? || onboarding_status.single_invite?
end
# overridden in EE
def registration_path_params
{}
end
def track_successful_user_creation(user)
label = user_invited? ? 'invited' : 'signup'
Gitlab::Tracking.event(self.class.name, 'create_user', label: label, user: user)

5
app/helpers/registrations_helper.rb
View File

@ -10,11 +10,6 @@ module RegistrationsHelper
testid: 'new-user-username-field'
}
end
# overridden in EE
def register_omniauth_params(_local_assigns)
{}
end
end
RegistrationsHelper.prepend_mod_with('RegistrationsHelper')

5
app/services/git/branch_hooks_service.rb
View File

@ -2,6 +2,7 @@
module Git
class BranchHooksService < ::Git::BaseHooksService
include Gitlab::InternalEventsTracking
extend ::Gitlab::Utils::Override
JIRA_SYNC_BATCH_SIZE = 20
@ -107,9 +108,7 @@ module Git
return unless default_branch?
commits_changing_ci_config.each do |commit|
Gitlab::UsageDataCounters::HLLRedisCounter.track_event(
'o_pipeline_authoring_unique_users_committing_ciconfigfile', values: commit.author&.id
)
track_internal_event('commit_change_to_ciconfigfile', user: commit.author, project: commit.project)
end
end

4
app/views/devise/registrations/new.html.haml
View File

@ -10,7 +10,7 @@
.signup-page
.gl-mb-3.gl-p-4
= render 'signup_box_form',
url: registration_path(resource_name, registration_path_params),
url: registration_path(resource_name, ::Onboarding::Status.registration_path_params(params: params)),
button_text: _('Continue')
- if omniauth_enabled? && button_based_providers_enabled?
@ -20,7 +20,7 @@
.gl-flex.gl-flex-col.gl-gap-3
- enabled_button_based_providers.each do |provider|
= render 'devise/shared/omniauth_provider_button',
href: omniauth_authorize_path(:user, provider, register_omniauth_params({})),
href: omniauth_authorize_path(:user, provider, ::Onboarding::Status.registration_path_params(params: params)),
provider: provider,
classes: 'js-track-omni-auth',
data: { provider: provider, track_action: "#{provider}_sso", track_label: preregistration_tracking_label }

2
app/workers/post_receive.rb
View File

@ -5,7 +5,7 @@ class PostReceive
idempotent!
deduplicate :none
data_consistency :always
data_consistency :sticky, feature_flag: :load_balanacing_for_sticky_post_receive_worker
sidekiq_options retry: 3
include Gitlab::Experiment::Dsl

18
config/events/commit_change_to_ciconfigfile.yml Normal file
View File

@ -0,0 +1,18 @@
---
description: A commit that included a change to the CI config file
internal_events: true
action: commit_change_to_ciconfigfile
identifiers:
- project
- namespace
- user
product_group: pipeline_authoring
milestone: '17.5'
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/166870
distributions:
- ce
- ee
tiers:
- free
- premium
- ultimate

16
config/feature_flags/development/ai_custom_models_prompts_migration.yml → config/feature_flags/worker/load_balanacing_for_sticky_post_receive_worker.yml
View File

@ -1,9 +1,9 @@
---
name: ai_custom_models_prompts_migration
feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/473156
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/160050
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/473358
milestone: '17.3'
group: group::custom models
type: development
default_enabled: true
name: load_balanacing_for_sticky_post_receive_worker
feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/402254
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/167317
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/495040
milestone: '17.5'
group: group::source code
type: worker
default_enabled: false

9
config/metrics/counts_28d/20210216184303_o_pipeline_authoring_unique_users_committing_ciconfigfile_monthly.yml
View File

@ -7,11 +7,10 @@ product_group: pipeline_authoring
value_type: number
status: active
time_frame: 28d
data_source: redis_hll
instrumentation_class: RedisHLLMetric
options:
events:
- o_pipeline_authoring_unique_users_committing_ciconfigfile
data_source: internal_events
events:
- name: commit_change_to_ciconfigfile
unique: user.id
distribution:
- ee
- ce

2
config/metrics/counts_28d/20210427105033_pipeline_authoring_total_unique_counts_monthly.yml
View File

@ -11,7 +11,7 @@ time_frame: 28d
data_source: redis_hll
instrumentation_class: RedisHLLMetric
events:
- name: o_pipeline_authoring_unique_users_committing_ciconfigfile
- name: commit_change_to_ciconfigfile
unique: user.id
- name: o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile
unique: user.id

21
config/metrics/counts_28d/count_total_commit_change_to_ciconfigfile_monthly.yml Normal file
View File

@ -0,0 +1,21 @@
---
key_path: counts.count_total_commit_change_to_ciconfigfile_monthly
description: Monthly count of commits that include a change to the CI config file.
product_group: pipeline_authoring
performance_indicator_type: []
value_type: number
status: active
milestone: '17.5'
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/166870
time_frame: 28d
data_source: internal_events
data_category: optional
distribution:
- ce
- ee
tier:
- free
- premium
- ultimate
events:
- name: commit_change_to_ciconfigfile

9
config/metrics/counts_7d/20210216184301_o_pipeline_authoring_unique_users_committing_ciconfigfile_weekly.yml
View File

@ -6,11 +6,10 @@ product_group: pipeline_authoring
value_type: number
status: active
time_frame: 7d
data_source: redis_hll
instrumentation_class: RedisHLLMetric
options:
events:
- o_pipeline_authoring_unique_users_committing_ciconfigfile
data_source: internal_events
events:
- name: commit_change_to_ciconfigfile
unique: user.id
performance_indicator_type:
- customer_health_score
distribution:

2
config/metrics/counts_7d/20210427105030_pipeline_authoring_total_unique_counts_weekly.yml
View File

@ -11,7 +11,7 @@ time_frame: 7d
data_source: redis_hll
instrumentation_class: RedisHLLMetric
events:
- name: o_pipeline_authoring_unique_users_committing_ciconfigfile
- name: commit_change_to_ciconfigfile
unique: user.id
- name: o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile
unique: user.id

21
config/metrics/counts_7d/count_total_commit_change_to_ciconfigfile_weekly.yml Normal file
View File

@ -0,0 +1,21 @@
---
key_path: counts.count_total_commit_change_to_ciconfigfile_weekly
description: Weekly count of commits that include a change to the CI config file.
product_group: pipeline_authoring
performance_indicator_type: []
value_type: number
status: active
milestone: '17.5'
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/166870
time_frame: 7d
data_source: internal_events
data_category: optional
distribution:
- ce
- ee
tier:
- free
- premium
- ultimate
events:
- name: commit_change_to_ciconfigfile

5
db/docs/batched_background_migrations/backfill_approval_merge_request_rules_project_id.yml
View File

@ -1,8 +1,9 @@
---
migration_job_name: BackfillApprovalMergeRequestRulesProjectId
description: Backfills sharding key `approval_merge_request_rules.project_id` from `merge_requests`.
description: Backfills sharding key `approval_merge_request_rules.project_id` from
`merge_requests`.
feature_category: code_review_workflow
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/151630
milestone: '17.0'
queued_migration_version: 20240501044351
finalized_by: # version of the migration that finalized this BBM
finalized_by: '20240926232124'

21
db/post_migrate/20240926232124_finalize_backfill_approval_merge_request_rules_project_id.rb Normal file
View File

@ -0,0 +1,21 @@
# frozen_string_literal: true
class FinalizeBackfillApprovalMergeRequestRulesProjectId < Gitlab::Database::Migration[2.2]
milestone '17.5'
disable_ddl_transaction!
restrict_gitlab_migration gitlab_schema: :gitlab_main_cell
def up
ensure_batched_background_migration_is_finished(
job_class_name: 'BackfillApprovalMergeRequestRulesProjectId',
table_name: :approval_merge_request_rules,
column_name: :id,
job_arguments: [:project_id, :merge_requests, :target_project_id, :merge_request_id],
finalize: true
)
end
def down; end
end

1
db/schema_migrations/20240926232124 Normal file
View File

@ -0,0 +1 @@
40ef4b168762fa3fa3df2881eef2ce452093f7dba819387d38356c8cfa2a54bb

6
doc/api/environments.md
View File

@ -39,6 +39,7 @@ Example response:
"id": 1,
"name": "review/fix-foo",
"slug": "review-fix-foo-dfjre3",
"description": "This is review environment",
"external_url": "https://review-fix-foo-dfjre3.gitlab.example.com",
"state": "available",
"tier": "development",
@ -75,6 +76,7 @@ Example of response
"id": 1,
"name": "review/fix-foo",
"slug": "review-fix-foo-dfjre3",
"description": "This is review environment",
"external_url": "https://review-fix-foo-dfjre3.gitlab.example.com",
"state": "available",
"tier": "development",
@ -200,6 +202,7 @@ POST /projects/:id/environments
|------------------------|----------------|----------|---------------------------------------------------------------------------------------------------------------------|
| `id` | integer/string | yes | The ID or [URL-encoded path](rest/index.md#namespaced-path-encoding) of the project. |
| `name` | string | yes | The name of the environment. |
| `description` | string | no | The description of the environment. |
| `external_url` | string | no | Place to link to for this environment. |
| `tier` | string | no | The tier of the new environment. Allowed values are `production`, `staging`, `testing`, `development`, and `other`. |
| `cluster_agent_id` | integer | no | The cluster agent to associate with this environment. |
@ -218,6 +221,7 @@ Example response:
"id": 1,
"name": "deploy",
"slug": "deploy",
"description": null,
"external_url": "https://deploy.gitlab.example.com",
"state": "available",
"tier": "production",
@ -244,6 +248,7 @@ PUT /projects/:id/environments/:environments_id
|------------------------|-----------------|----------|---------------------------------------------------------------------------------------------------------------------|
| `id` | integer/string | yes | The ID or [URL-encoded path of the project](rest/index.md#namespaced-path-encoding). |
| `environment_id` | integer | yes | The ID of the environment. |
| `description` | string | no | The description of the environment. |
| `external_url` | string | no | The new `external_url`. |
| `tier` | string | no | The tier of the new environment. Allowed values are `production`, `staging`, `testing`, `development`, and `other`. |
| `cluster_agent_id` | integer or null | no | The cluster agent to associate with this environment or `null` to remove it. |
@ -262,6 +267,7 @@ Example response:
"id": 1,
"name": "staging",
"slug": "staging",
"description": null,
"external_url": "https://staging.gitlab.example.com",
"state": "available",
"tier": "staging",

32
doc/api/graphql/reference/index.md
View File

@ -366,22 +366,6 @@ DETAILS:
Returns [`CloudConnectorStatus`](#cloudconnectorstatus).
### `Query.components`
Find software dependencies by name.
DETAILS:
**Introduced** in GitLab 17.4.
**Status**: Experiment.
Returns [`[Component!]`](#component).
#### Arguments
| Name | Type | Description |
| ---- | ---- | ----------- |
| <a id="querycomponentsname"></a>`name` | [`String`](#string) | Entire name or part of the name. |
### `Query.containerRepository`
Find a container repository.
@ -23531,6 +23515,22 @@ four standard [pagination arguments](#pagination-arguments):
| <a id="groupcomplianceframeworksids"></a>`ids` | [`[ComplianceManagementFrameworkID!]`](#compliancemanagementframeworkid) | List of Global IDs of compliance frameworks to return. |
| <a id="groupcomplianceframeworkssearch"></a>`search` | [`String`](#string) | Search framework with most similar names. |
##### `Group.components`
Find software dependencies by name.
DETAILS:
**Introduced** in GitLab 17.5.
**Status**: Experiment.
Returns [`[Component!]`](#component).
###### Arguments
| Name | Type | Description |
| ---- | ---- | ----------- |
| <a id="groupcomponentsname"></a>`name` | [`String`](#string) | Entire name or part of the name. |
##### `Group.contactStateCounts`
Counts of contacts by state for the group.

51
doc/development/uploads/index.md
View File

@ -118,6 +118,57 @@ This strategy is a different form of [Workhorse assistance](#workhorse-assisted-
Of all existing upload strategies, direct upload is best able to handle large (gigabyte) uploads.
### Disk buffered uploads
Direct upload falls back to _disk buffered upload_ when `direct_upload` is disabled inside the [object storage setting](../../administration/uploads.md#object-storage-settings). The answer to the `/authorize` call contains only a file system path.
```mermaid
sequenceDiagram
participant c as Client
participant w as Workhorse
participant r as Rails
participant os as Object Storage
activate c
c ->>+w: POST /some/url/upload
w ->>+r: POST /some/url/upload/authorize
Note over w,r: this request has an empty body
r-->>-w: presigned OS URL
w->>+os: PUT file
Note over w,os: file is stored on a temporary location. Rails select the destination
os-->>-w: request result
w->>+r: POST /some/url/upload
Note over w,r: file was replaced with its location<br>and other metadata
r->>+os: move object to final destination
os-->>-r: request result
opt requires async processing
r->>+redis: schedule a job
redis-->>-r: job is scheduled
end
r-->>-c: request result
deactivate c
w->>-w: cleanup
opt requires async processing
activate sidekiq
sidekiq->>+redis: fetch a job
redis-->>-sidekiq: job
sidekiq->>+os: get object
os-->>-sidekiq: file
sidekiq->>sidekiq: process file
deactivate sidekiq
end
```
## Workhorse assisted uploads
Most uploads receive assistance from Workhorse in some way.

28
doc/user/project/repository/code_suggestions/repository_xray.md
View File

@ -37,20 +37,20 @@ The Repository X-Ray service is automatically enabled if:
The Repository X-Ray searches a maximum of two directory levels from the repository's root. For example, it supports `Gemfile.lock`, `api/Gemfile.lock`, or `api/client/Gemfile.lock`, but not `api/v1/client/Gemfile.lock`. For each language, only the first matching configuration file is processed. Where available, lock files take precedence over their non-lock file counterparts.
| Language | Package manager | Configuration file | GitLab version |
| ---------- |-----------------| -------------------- | -------------- |
| C/C++ | Conan | `conanfile.py` | 17.5 or later |
| C/C++ | Conan | `conanfile.txt` | 17.5 or later |
| C/C++ | vcpkg | `vcpkg.json` | 17.5 or later |
| C# | NuGet | `*.csproj` | 17.5 or later |
| Go | Go Modules | `go.mod` | 17.4 or later |
| Java | Gradle | `build.gradle` | 17.4 or later |
| Java | Maven | `pom.xml` | 17.4 or later |
| Kotlin | Gradle | `build.gradle.kts` | 17.5 or later |
| Python | Conda | `environment.yml` | 17.5 or later |
| Python | Pip | `requirements.txt` | 17.5 or later |
| Python | Poetry | `pyproject.toml` | 17.5 or later |
| Ruby | RubyGems | `Gemfile.lock` | 17.4 or later |
| Language | Package manager | Configuration file | GitLab version |
| ---------- |-----------------| -------------------------------- | -------------- |
| C/C++ | Conan | `conanfile.py` | 17.5 or later |
| C/C++ | Conan | `conanfile.txt` | 17.5 or later |
| C/C++ | vcpkg | `vcpkg.json` | 17.5 or later |
| C# | NuGet | `*.csproj` | 17.5 or later |
| Go | Go Modules | `go.mod` | 17.4 or later |
| Java | Gradle | `build.gradle` | 17.4 or later |
| Java | Maven | `pom.xml` | 17.4 or later |
| Kotlin | Gradle | `build.gradle.kts` | 17.5 or later |
| Python | Conda | `environment.yml` | 17.5 or later |
| Python | Pip | `requirements.txt` | 17.5 or later |
| Python | Poetry | `poetry.lock`, `pyproject.toml` | 17.5 or later |
| Ruby | RubyGems | `Gemfile.lock` | 17.4 or later |
## Enable Repository X-Ray in your CI pipeline (deprecated)

1
lib/api/entities/environment.rb
View File

@ -13,6 +13,7 @@ module API
expose :cluster_agent, using: Entities::Clusters::Agent, if: ->(_, _) { can_read_cluster_agent? }
expose :kubernetes_namespace, if: ->(_, _) { can_read_cluster_agent? }
expose :flux_resource_path, if: ->(_, _) { can_read_cluster_agent? }
expose :description, documentation: { type: 'string', example: 'description' }
private

4
lib/api/environments.rb
View File

@ -69,6 +69,7 @@ module API
optional :cluster_agent_id, type: Integer, desc: 'The ID of the Cluster Agent to associate with this environment'
optional :kubernetes_namespace, type: String, desc: 'The Kubernetes namespace to associate with this environment'
optional :flux_resource_path, type: String, desc: 'The Flux resource path to associate with this environment'
optional :description, type: String, desc: 'The description of the environment'
end
route_setting :authentication, job_token_allowed: true
post ':id/environments' do
@ -109,6 +110,7 @@ module API
optional :cluster_agent_id, type: Integer, desc: 'The ID of the Cluster Agent to associate with this environment'
optional :kubernetes_namespace, type: String, desc: 'The Kubernetes namespace to associate with this environment'
optional :flux_resource_path, type: String, desc: 'The Flux resource path to associate with this environment'
optional :description, type: String, desc: 'The description of the environment'
end
route_setting :authentication, job_token_allowed: true
put ':id/environments/:environment_id' do
@ -116,7 +118,7 @@ module API
environment = user_project.environments.find(params[:environment_id])
update_params = declared_params(include_missing: false).extract!(:external_url, :tier, :cluster_agent_id, :kubernetes_namespace, :flux_resource_path)
update_params = declared_params(include_missing: false).extract!(:external_url, :tier, :cluster_agent_id, :kubernetes_namespace, :flux_resource_path, :description)
if update_params[:cluster_agent_id]
agent = ::Clusters::AgentsFinder.new(user_project, current_user).execute.find_by_id(params[:cluster_agent_id])

1
lib/gitlab/usage_data_counters/hll_redis_key_overrides.yml
View File

@ -174,3 +174,4 @@ user_visited_dashboard-user: user_visited_dashboard
visit_ci_cd_failure_rate_tab-user: p_analytics_ci_cd_change_failure_rate
visit_ci_cd_time_to_restore_service_tab-user: p_analytics_ci_cd_time_to_restore_service
visit_compliance_credential_inventory-user: i_compliance_credential_inventory
commit_change_to_ciconfigfile-user: o_pipeline_authoring_unique_users_committing_ciconfigfile

1
lib/gitlab/usage_data_counters/hll_redis_legacy_events.yml
View File

@ -353,7 +353,6 @@
- k8s_api_proxy_requests_unique_agents_via_pat_access
- k8s_api_proxy_requests_unique_agents_via_user_access
- merge_request_action
- o_pipeline_authoring_unique_users_committing_ciconfigfile
- o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile
- p_analytics_code_reviews
- p_analytics_insights

9
locale/gitlab.pot
View File

@ -3895,6 +3895,9 @@ msgstr ""
msgid "AdminSelfHostedModels|An API key is set"
msgstr ""
msgid "AdminSelfHostedModels|An error occurred while deleting your self-hosted model. Please try again."
msgstr ""
msgid "AdminSelfHostedModels|An error occurred while loading self-hosted models. Please try again."
msgstr ""
@ -3982,6 +3985,9 @@ msgstr ""
msgid "AdminSelfHostedModels|There was an error saving the self-hosted model. Please try again."
msgstr ""
msgid "AdminSelfHostedModels|Your self-hosted model was successfully deleted."
msgstr ""
msgid "AdminSettings|%{generate_manually_link_start}Generate%{generate_manually_link_end} Service Ping to preview and download service usage data payload."
msgstr ""
@ -38325,6 +38331,9 @@ msgstr ""
msgid "Orphaned member"
msgstr ""
msgid "Orphaned request"
msgstr ""
msgid "Other"
msgstr ""

2
qa/gdk/Dockerfile.gdk
View File

@ -1,4 +1,4 @@
ARG GDK_SHA=59f9233de457781829a606c11e775b4809677dc3
ARG GDK_SHA=25dd408d7727657811bf9fb59b1cbc15d4f1d160
# Use tag prefix when running on 'stable' branch to make sure 'protected' image is used which is not deleted by registry cleanup
ARG GDK_BASE_TAG_PREFIX

15
spec/controllers/concerns/onboarding/status_spec.rb
View File

@ -7,6 +7,21 @@ RSpec.describe Onboarding::Status, feature_category: :onboarding do
let_it_be(:user) { member.user }
let_it_be(:source) { member.group }
describe '.registration_path_params' do
let(:params) { { some: 'thing' } }
let(:extra_params) { { another_extra: 'param' } }
subject { described_class.registration_path_params(params: params) }
it { is_expected.to eq({}) }
context 'when extra params are passed' do
subject { described_class.registration_path_params(params: params, extra_params: extra_params) }
it { is_expected.to eq({}) }
end
end
describe '#single_invite?' do
subject { described_class.new(nil, nil, user).single_invite? }

3
spec/fixtures/api/schemas/public_api/v4/environment.json vendored
View File

@ -23,6 +23,9 @@
"tier": {
"type": "string"
},
"description": {
"$ref": "../../types/nullable_string.json"
},
"external_url": {
"$ref": "../../types/nullable_string.json"
},

36
spec/frontend/__helpers__/vue_test_utils_helper.js
View File

@ -9,10 +9,6 @@ import {
} from '@vue/test-utils';
import { compose } from 'lodash/fp';
const vNodeContainsText = (vnode, text) =>
(vnode.text && vnode.text.includes(text)) ||
(vnode.children && vnode.children.filter((child) => vNodeContainsText(child, text)).length);
/**
* Create a VTU wrapper from an element.
*
@ -27,38 +23,6 @@ const createWrapperFromElement = (element, options) =>
// eslint-disable-next-line no-underscore-dangle
createWrapper(element.__vue__ || element, options || {});
/**
* Determines whether a `shallowMount` Wrapper contains text
* within one of it's slots. This will also work on Wrappers
* acquired with `find()`, but only if it's parent Wrapper
* was shallowMounted.
* NOTE: Prefer checking the rendered output of a component
* wherever possible using something like `text()` instead.
* @param {Wrapper} shallowWrapper - Vue test utils wrapper (shallowMounted)
* @param {String} slotName
* @param {String} text
*/
export const shallowWrapperContainsSlotText = (shallowWrapper, slotName, text) =>
Boolean(
shallowWrapper.vm.$slots[slotName].filter((vnode) => vNodeContainsText(vnode, text)).length,
);
/**
* Returns a promise that waits for a mutation to be fired before resolving
* NOTE: There's no reject action here so it will hang if it waits for a mutation that won't happen.
* @param {Object} store - The Vue store that contains the mutations
* @param {String} expectedMutationType - The Mutation to wait for
*/
export const waitForMutation = (store, expectedMutationType) =>
new Promise((resolve) => {
const unsubscribe = store.subscribe((mutation) => {
if (mutation.type === expectedMutationType) {
unsubscribe();
resolve();
}
});
});
/**
* Query function type
* @callback FindFunction

51
spec/frontend/__helpers__/vue_test_utils_helper_spec.js
View File

@ -7,12 +7,7 @@ import {
ErrorWrapper as VTUErrorWrapper,
} from '@vue/test-utils';
import Vue from 'vue';
import {
extendedWrapper,
shallowMountExtended,
mountExtended,
shallowWrapperContainsSlotText,
} from './vue_test_utils_helper';
import { extendedWrapper, shallowMountExtended, mountExtended } from './vue_test_utils_helper';
jest.mock('@testing-library/dom', () => ({
__esModule: true,
@ -24,50 +19,6 @@ describe('Vue test utils helpers', () => {
jest.unmock('@testing-library/dom');
});
describe('shallowWrapperContainsSlotText', () => {
const mockText = 'text';
const mockSlot = `<div>${mockText}</div>`;
let mockComponent;
beforeEach(() => {
mockComponent = shallowMount(
{
render(h) {
h(`<div>mockedComponent</div>`);
},
},
{
slots: {
default: mockText,
namedSlot: mockSlot,
},
},
);
});
it('finds text within shallowWrapper default slot', () => {
expect(shallowWrapperContainsSlotText(mockComponent, 'default', mockText)).toBe(true);
});
it('finds text within shallowWrapper named slot', () => {
expect(shallowWrapperContainsSlotText(mockComponent, 'namedSlot', mockText)).toBe(true);
});
it('returns false when text is not present', () => {
const searchText = 'absent';
expect(shallowWrapperContainsSlotText(mockComponent, 'default', searchText)).toBe(false);
expect(shallowWrapperContainsSlotText(mockComponent, 'namedSlot', searchText)).toBe(false);
});
it('searches with case-sensitivity', () => {
const searchText = mockText.toUpperCase();
expect(shallowWrapperContainsSlotText(mockComponent, 'default', searchText)).toBe(false);
expect(shallowWrapperContainsSlotText(mockComponent, 'namedSlot', searchText)).toBe(false);
});
});
describe('extendedWrapper', () => {
describe('when an invalid wrapper is provided', () => {
beforeEach(() => {

3
spec/frontend/environment.js
View File

@ -26,6 +26,9 @@ class CustomEnvironment extends TestEnvironment {
// https://gitlab.com/gitlab-org/gitlab/-/issues/396779#note_1788506238
/^\[Vue warn\]: Missing required prop/,
/^\[Vue warn\]: Invalid prop/,
// TODO: Implement robust vue-demi switching logic.
// https://gitlab.com/groups/gitlab-org/-/epics/15340
/^\[Vue warn\]: \(deprecation GLOBAL_PRIVATE_UTIL\)/,
],
// TODO: Remove this and replace with localized calls to `useConsoleWatcherThrowsImmediately`
// https://gitlab.com/gitlab-org/gitlab/-/issues/396779#note_1788506238

8
spec/helpers/registrations_helper_spec.rb
View File

@ -8,12 +8,4 @@ RSpec.describe RegistrationsHelper, feature_category: :user_management do
expect(helper.signup_username_data_attributes.keys).to include(:min_length, :min_length_message, :max_length, :max_length_message, :testid)
end
end
describe '#register_omniauth_params' do
it 'adds intent to register' do
allow(helper).to receive(:glm_tracking_params).and_return({})
expect(helper.register_omniauth_params({})).to eq({})
end
end
end

15
spec/requests/api/environments_spec.rb
View File

@ -8,7 +8,7 @@ RSpec.describe API::Environments, feature_category: :continuous_delivery do
let_it_be(:non_member) { create(:user) }
let_it_be(:reporter) { create(:user) }
let_it_be(:project) { create(:project, :private, :repository, namespace: user.namespace, maintainers: user, developers: developer, reporters: reporter) }
let_it_be_with_reload(:environment) { create(:environment, project: project) }
let_it_be_with_reload(:environment) { create(:environment, project: project, description: 'description') }
describe 'GET /projects/:id/environments', :aggregate_failures do
context 'as member of the project' do
@ -22,6 +22,7 @@ RSpec.describe API::Environments, feature_category: :continuous_delivery do
expect(json_response.size).to eq(1)
expect(json_response.first['name']).to eq(environment.name)
expect(json_response.first['tier']).to eq(environment.tier)
expect(json_response.first['description']).to eq(environment.description)
expect(json_response.first['external_url']).to eq(environment.external_url)
expect(json_response.first['project']).to match_schema('public_api/v4/project')
expect(json_response.first).not_to have_key('last_deployment')
@ -126,11 +127,12 @@ RSpec.describe API::Environments, feature_category: :continuous_delivery do
describe 'POST /projects/:id/environments' do
context 'as a member' do
it 'creates an environment with valid params' do
post api("/projects/#{project.id}/environments", user), params: { name: "mepmep", tier: 'staging' }
post api("/projects/#{project.id}/environments", user), params: { name: "mepmep", tier: 'staging', description: 'description' }
expect(response).to have_gitlab_http_status(:created)
expect(response).to match_response_schema('public_api/v4/environment')
expect(json_response['name']).to eq('mepmep')
expect(json_response['description']).to eq('description')
expect(json_response['slug']).to eq('mepmep')
expect(json_response['tier']).to eq('staging')
expect(json_response['external']).to be nil
@ -316,6 +318,15 @@ RSpec.describe API::Environments, feature_category: :continuous_delivery do
expect(json_response['external_url']).to eq(url)
end
it 'returns a 200 if description is changed' do
put api("/projects/#{project.id}/environments/#{environment.id}", user),
params: { description: 'new description' }
expect(response).to have_gitlab_http_status(:ok)
expect(response).to match_response_schema('public_api/v4/environment')
expect(json_response['description']).to eq('new description')
end
it 'returns a 200 if tier is changed' do
put api("/projects/#{project.id}/environments/#{environment.id}", user),
params: { tier: 'production' }

30
spec/services/git/branch_hooks_service_spec.rb
View File

@ -121,26 +121,24 @@ RSpec.describe Git::BranchHooksService, :clean_gitlab_redis_shared_state, featur
let!(:commit_author) { create(:user, email: sample_commit.author_email) }
let(:tracking_params) do
['o_pipeline_authoring_unique_users_committing_ciconfigfile', { values: commit_author.id }]
end
it 'tracks the event' do
time = Time.zone.now
execute_service
expect(Gitlab::UsageDataCounters::HLLRedisCounter.unique_events(event_names: 'o_pipeline_authoring_unique_users_committing_ciconfigfile', start_date: time, end_date: time + 7.days)).to eq(1)
expect { subject }
.to trigger_internal_events('commit_change_to_ciconfigfile')
.with(category: 'Git::BranchHooksService', user: commit_author, project: project)
.and increment_usage_metrics(
'redis_hll_counters.pipeline_authoring.o_pipeline_authoring_unique_users_committing_ciconfigfile_weekly',
'redis_hll_counters.pipeline_authoring.o_pipeline_authoring_unique_users_committing_ciconfigfile_monthly',
'redis_hll_counters.pipeline_authoring.pipeline_authoring_total_unique_counts_weekly',
'redis_hll_counters.pipeline_authoring.pipeline_authoring_total_unique_counts_monthly'
)
end
context 'when the branch is not the main branch' do
let(:branch) { 'feature' }
it 'does not track the event' do
expect(Gitlab::UsageDataCounters::HLLRedisCounter)
.not_to receive(:track_event).with(*tracking_params)
execute_service
expect { subject }
.not_to trigger_internal_events('commit_change_to_ciconfigfile')
end
end
@ -150,10 +148,8 @@ RSpec.describe Git::BranchHooksService, :clean_gitlab_redis_shared_state, featur
end
it 'does not track the event' do
expect(Gitlab::UsageDataCounters::HLLRedisCounter)
.not_to receive(:track_event).with(*tracking_params)
execute_service
expect { subject }
.not_to trigger_internal_events('commit_change_to_ciconfigfile')
end
end
end

6
spec/views/devise/registrations/new.html.haml_spec.rb
View File

@ -11,12 +11,14 @@ RSpec.describe 'devise/registrations/new', feature_category: :system_access do
before do
allow(view).to receive(:resource).and_return(resource)
allow(view).to receive(:resource_name).and_return(:user)
allow(view).to receive(:glm_tracking_params).and_return({})
allow(view).to receive(:registration_path_params).and_return({})
allow(view).to receive(:preregistration_tracking_label).and_return(tracking_label)
allow(view).to receive(:arkose_labs_enabled?)
end
context 'for password form' do
it { is_expected.to have_css('form[action="/users"]') }
end
context 'for omniauth provider buttons' do
let(:provider_label) { :github }
let(:tracking_action) { "#{provider_label}_sso" }