Skip to content

Commit eed7260

Browse files
author
GitLab Bot
committed
Add latest changes from gitlab-org/gitlab@master
1 parent ef211f6 commit eed7260

File tree

111 files changed

+1190
-1768
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+1190
-1768
lines changed

.gitlab/CODEOWNERS

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -325,9 +325,9 @@ Dangerfile
325325
/ee/app/assets/javascripts/analytics/analytics_dashboards/index.js
326326
/ee/app/assets/javascripts/analytics/analytics_dashboards/router.js
327327
/ee/app/assets/javascripts/analytics/analytics_dashboards/constants.js
328-
/ee/app/assets/javascripts/analytics/analytics_dashboards/graphql/queries/get_all_product_analytics_dashboards.query.graphql
329-
/ee/app/assets/javascripts/analytics/analytics_dashboards/graphql/queries/get_product_analytics_dashboard.query.graphql
330-
/ee/app/assets/javascripts/analytics/analytics_dashboards/graphql/queries/get_all_product_analytics_visualizations.query.graphql
328+
/ee/app/assets/javascripts/analytics/analytics_dashboards/graphql/queries/get_all_customizable_dashboards.query.graphql
329+
/ee/app/assets/javascripts/analytics/analytics_dashboards/graphql/queries/get_customizable_dashboard.query.graphql
330+
/ee/app/assets/javascripts/analytics/analytics_dashboards/graphql/queries/get_all_customizable_visualizations.query.graphql
331331
/ee/app/assets/javascripts/vue_shared/components/customizable_dashboard/customizable_dashboard.vue
332332
/ee/app/assets/javascripts/vue_shared/components/customizable_dashboard/panels_base.vue
333333
/ee/app/assets/javascripts/product_analytics/

.gitlab/ci/qa-common/main.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ include:
1414
gitlab_auth_token_variable_name: "PROJECT_TOKEN_FOR_CI_SCRIPTS_API_USAGE"
1515
allure_job_name: "${QA_RUN_TYPE}"
1616
- project: gitlab-org/quality/pipeline-common
17-
ref: 7.10.0
17+
ref: 7.10.2
1818
file:
1919
- /ci/base.gitlab-ci.yml
2020
- /ci/knapsack-report.yml

.gitlab/issue_templates/AI Project Proposal.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ _What [personas](https://about.gitlab.com/handbook/product/personas/#list-of-use
3232
### Success
3333
_How will you measure whether this experiment is a success?_
3434

35-
**UX maturity requirements** _[Experiment to Beta](https://internal-handbook.gitlab.io/handbook/product/ai-strategy/ai-integration-effort/ux_maturity/#criteria-and-requirements)_
35+
**UX maturity requirements** _[Experiment to Beta](https://about.gitlab.com/handbook/product/ai/ux-maturity/#criteria-and-requirements)_
3636
| Criteria | Minimum Requirement | Assessment for Beta |
3737
| -------- | ------------------- | ------------------- |
38-
| [Problem validation](https://internal-handbook.gitlab.io/handbook/product/ai-strategy/ai-integration-effort/ux_maturity/#validation-problem-validation)<br>How well do we understand the problem? | [Mix of evidence and assumptions](https://internal-handbook.gitlab.io/handbook/product/ai-strategy/ai-integration-effort/ux_maturity/#questions-to-ask) | <!-- Acceptable answers: Yes, Somewhat or Somewhat, Somewhat --> |
39-
| [Solution validation](https://internal-handbook.gitlab.io/handbook/product/ai-strategy/ai-integration-effort/ux_maturity/#validation-solution-validation)<br>How usable is the solution? | [Heuristic Eval](https://about.gitlab.com/handbook/product/ux/ux-scorecards/#option-a-conduct-a-heuristic-evaluation), Grade C | <!-- Acceptable grade: C --> |
40-
| [Improve](https://internal-handbook.gitlab.io/handbook/product/ai-strategy/ai-integration-effort/ux_maturity/#build-improve)<br>How successful is the solution? | [Success metrics defined by the team.](https://about.gitlab.com/handbook/product/ux/ux-research/usability-testing/#usability-at-gitlab) | <!-- Acceptable answers: :white_check_mark: All success metrics defined for this phase have been met. --> |
41-
| [Design standards](https://internal-handbook.gitlab.io/handbook/product/ai-strategy/ai-integration-effort/ux_maturity/#design-standards) adherence<br>How compliant is the solution with our design standards? | Should adhere to ([PJs](https://design.gitlab.com/), [Design](https://docs.gitlab.com/ee/development/contributing/design.html#checklist)) | <!-- Acceptable: Mostly adheres to PJs and design standards --> |
38+
| [Problem validation](https://about.gitlab.com/handbook/product/ai/ux-maturity/#validation-problem-validation)<br>How well do we understand the problem? | [Mix of evidence and assumptions](https://about.gitlab.com/handbook/product/ai/ux-maturity/#questions-to-ask) | <!-- Acceptable answers: Yes, Somewhat or Somewhat, Somewhat --> |
39+
| [Solution validation](https://about.gitlab.com/handbook/product/ai/ux-maturity/#validation-solution-validation)<br>How usable is the solution? | [Usability testing](https://about.gitlab.com/handbook/product/ux/ux-scorecards/#option-b-perform-a-formative-evaluation), Grade C | <!-- Acceptable: >80% and grade C --> |
40+
| [Improve](https://about.gitlab.com/handbook/product/ai/ux-maturity/#build-improve)<br>How successful is the solution? | Quality goals set by the team are reached. | <!-- Acceptable answers: :white_check_mark: Reached all quality goals for this phase. --> |
41+
| [Design standards](https://about.gitlab.com/handbook/product/ai/ux-maturity/#design-standards) adherence<br>How compliant is the solution with our design standards? | Should adhere to ([Pajamas](https://design.gitlab.com/), [checklist](https://docs.gitlab.com/ee/development/contributing/design.html#checklist)) | <!-- Acceptable: Mostly adheres to design standards --> |
4242

4343
# [Beta](https://docs.gitlab.com/ee/policy/alpha-beta-support.html#beta)
4444
_This section should be completed prior to beginning work on the Beta experience._
@@ -61,7 +61,7 @@ _What assumptions are you making about this problem and the solution?_
6161

6262
### Problem validation
6363
_What validation exists that customers have this problem?_
64-
<!-- Refer to https://about.gitlab.com/handbook/product/ux/ux-research/research-in-the-AI-space/#guideline-1-problem-validation --- to help identify and understand user needs -->
64+
<!-- Refer to https://about.gitlab.com/handbook/product/ux/ux-research/research-in-the-AI-space/#guideline-1-problem-validation---identify-and-understand-user-needs --- to help identify and understand user needs -->
6565

6666
### Business objective
6767
_What business objective will be achieved with this proposal?_
@@ -80,13 +80,13 @@ _What tasks or actions should the user be capable of performing with this featur
8080
_How will you measure whether this Beta is a success?_
8181
<!-- Consider how successful the solution is by looking beyond feature usage as the success metric. Instead consider how useful, efficient, effective, satisfying, and learnable was the feature. The Product Development Flow recommends outcomes and potential activities to create a combined and ongoing quantitative and qualitative feedback loop to evaluate feature success. -->
8282

83-
**UX maturity requirements** _[Beta to GA](https://internal-handbook.gitlab.io/handbook/product/ai-strategy/ai-integration-effort/ux_maturity/#criteria-and-requirements)_
83+
**UX maturity requirements** _[Beta to GA](https://about.gitlab.com/handbook/product/ai/ux-maturity/#criteria-and-requirements)_
8484
| Criteria | Minimum Requirement | Assessment for GA |
8585
| -------- | ------------------- | ------------------- |
86-
| [Problem validation](https://internal-handbook.gitlab.io/handbook/product/ai-strategy/ai-integration-effort/ux_maturity/#validation-problem-validation)<br>How well do we understand the problem? | [Mix of evidence and assumptions](https://internal-handbook.gitlab.io/handbook/product/ai-strategy/ai-integration-effort/ux_maturity/#questions-to-ask) | <!-- Acceptable answers: Yes, Yes --> |
87-
| [Solution validation](https://internal-handbook.gitlab.io/handbook/product/ai-strategy/ai-integration-effort/ux_maturity/#validation-solution-validation)<br>How usable is the solution? | [Usability Testing](https://about.gitlab.com/handbook/product/ux/ux-scorecards/#option-b-perform-a-formative-evaluation) and/or [Heuristic Eval](https://about.gitlab.com/handbook/product/ux/ux-scorecards/#option-a-conduct-a-heuristic-evaluation), Avg. task pass rate >80%, Grade B | <!-- Acceptable: >80% and B --> |
88-
| [Improve](https://internal-handbook.gitlab.io/handbook/product/ai-strategy/ai-integration-effort/ux_maturity/#build-improve)<br>How successful is the solution? | [Success metrics defined by the team.](https://about.gitlab.com/handbook/product/ux/ux-research/usability-testing/#usability-at-gitlab) | <!-- Acceptable answers: :white_check_mark: All success metrics defined for this phase have been met. --> |
89-
| [Design standards](https://internal-handbook.gitlab.io/handbook/product/ai-strategy/ai-integration-effort/ux_maturity/#design-standards) adherence<br>How compliant is the solution with our design standards? | Should adhere to ([PJs](https://design.gitlab.com/), [Design](https://docs.gitlab.com/ee/development/contributing/design.html#checklist)) | <!-- Acceptable: Completely adheres to PJs and design standards --> |
86+
| [Problem validation](https://about.gitlab.com/handbook/product/ai/ux-maturity/#validation-problem-validation)<br>How well do we understand the problem? | [Mix of evidence and assumptions](https://about.gitlab.com/handbook/product/ai/ux-maturity/#questions-to-ask) | <!-- Acceptable answers: Yes, Yes --> |
87+
| [Solution validation](https://about.gitlab.com/handbook/product/ai/ux-maturity/#validation-solution-validation)<br>How usable is the solution? | [Usability testing](https://about.gitlab.com/handbook/product/ux/ux-scorecards/#option-b-perform-a-formative-evaluation) and [Heuristic evaluation](https://about.gitlab.com/handbook/product/ux/ux-scorecards/#option-a-conduct-a-heuristic-evaluation), Avg. task pass rate >80%, Grade B | <!-- Acceptable: >80% and grade B --> |
88+
| [Improve](https://about.gitlab.com/handbook/product/ai/ux-maturity/#build-improve)<br>How successful is the solution? | Quality goals set by the team are reached. | <!-- Acceptable answers: :white_check_mark: Reached all quality goals for this phase. --> |
89+
| [Design standards](https://about.gitlab.com/handbook/product/ai/ux-maturity/#design-standards) adherence<br>How compliant is the solution with our design standards? | Should adhere to ([Pajamas](https://design.gitlab.com/), [checklist](https://docs.gitlab.com/ee/development/contributing/design.html#checklist)) | <!-- Acceptable: Completely adheres to design standards --> |
9090

9191
# [Generally Available](https://docs.gitlab.com/ee/policy/alpha-beta-support.html#generally-available-ga)
9292
<!-- DO NOT REMOVE THIS SECTION
@@ -202,7 +202,7 @@ _What tasks or actions should the user be capable of performing with this featur
202202
- Read about our [AI Integration strategy](https://internal-handbook.gitlab.io/handbook/product/ai-strategy/ai-integration-effort/)
203203
- [AI-human interaction guidelines](https://design.gitlab.com/usability/ai-human-interaction)
204204
- [Highlighting feature versions guidelines](https://design.gitlab.com/usability/feature-management#highlighting-feature-versions)
205-
- [UX maturity requirements](https://internal-handbook.gitlab.io/handbook/product/ai-strategy/ai-integration-effort/ux_maturity/)
205+
- [UX maturity requirements](https://about.gitlab.com/handbook/product/ai/ux-maturity/)
206206
- **Slack channels**
207207
- `#wg_ai_integration` - Slack channel for the working group and the high-level alignment on getting AI ready for Production (Development, Product, UX, Legal, etc.) But from the other channels feel free to reach out and post progress here
208208
- `#ai_integration_dev_lobby` - Channel for all implementation-related topics and discussions of actual AI features (e.g. explain the code)

.rubocop_todo/gitlab/doc_url.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ Gitlab/DocUrl:
2727
- 'lib/gitlab/audit/auditor.rb'
2828
- 'lib/gitlab/ci/config/entry/processable.rb'
2929
- 'lib/gitlab/config_checker/external_database_checker.rb'
30-
- 'lib/gitlab/config_checker/puma_rugged_checker.rb'
3130
- 'lib/gitlab/database_warnings.rb'
3231
- 'lib/gitlab/database/migration_helpers/automatic_lock_writes_on_tables.rb'
3332
- 'lib/gitlab/database/migration_helpers/v2.rb'

.rubocop_todo/layout/first_hash_element_indentation.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,6 @@ Layout/FirstHashElementIndentation:
195195
- 'spec/lib/gitlab/ci/pipeline/chain/populate_spec.rb'
196196
- 'spec/lib/gitlab/ci/pipeline/seed/build/cache_spec.rb'
197197
- 'spec/lib/gitlab/ci/yaml_processor_spec.rb'
198-
- 'spec/lib/gitlab/config_checker/puma_rugged_checker_spec.rb'
199198
- 'spec/lib/gitlab/data_builder/build_spec.rb'
200199
- 'spec/lib/gitlab/data_builder/issuable_spec.rb'
201200
- 'spec/lib/gitlab/data_builder/pipeline_spec.rb'

.rubocop_todo/layout/line_continuation_spacing.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ Layout/LineContinuationSpacing:
109109
- 'lib/gitlab/background_migration/populate_operation_visibility_permissions_from_operations.rb'
110110
- 'lib/gitlab/checks/tag_check.rb'
111111
- 'lib/gitlab/ci/parsers/security/validators/schema_validator.rb'
112-
- 'lib/gitlab/config_checker/puma_rugged_checker.rb'
113112
- 'lib/gitlab/database/background_migration/batched_migration_runner.rb'
114113
- 'lib/gitlab/database/load_balancing/sidekiq_server_middleware.rb'
115114
- 'lib/gitlab/database/migration_helpers.rb'
@@ -144,7 +143,6 @@ Layout/LineContinuationSpacing:
144143
- 'spec/lib/gitlab/ci/parsers/security/validators/schema_validator_spec.rb'
145144
- 'spec/lib/gitlab/ci/trace/stream_spec.rb'
146145
- 'spec/lib/gitlab/closing_issue_extractor_spec.rb'
147-
- 'spec/lib/gitlab/config_checker/puma_rugged_checker_spec.rb'
148146
- 'spec/lib/gitlab/database/background_migration/batched_migration_runner_spec.rb'
149147
- 'spec/lib/gitlab/git_access_spec.rb'
150148
- 'spec/lib/gitlab/github_import/markdown_text_spec.rb'

.rubocop_todo/layout/line_end_string_concatenation_indentation.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,6 @@ Layout/LineEndStringConcatenationIndentation:
164164
- 'lib/gitlab/ci/parsers/security/validators/schema_validator.rb'
165165
- 'lib/gitlab/ci/pipeline/chain/populate.rb'
166166
- 'lib/gitlab/ci/pipeline/seed/build.rb'
167-
- 'lib/gitlab/config_checker/puma_rugged_checker.rb'
168167
- 'lib/gitlab/database/load_balancing/sidekiq_server_middleware.rb'
169168
- 'lib/gitlab/database/migration_helpers.rb'
170169
- 'lib/gitlab/database/migration_helpers/restrict_gitlab_schema.rb'

.rubocop_todo/layout/line_length.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2640,7 +2640,6 @@ Layout/LineLength:
26402640
- 'lib/gitlab/git/conflict/resolver.rb'
26412641
- 'lib/gitlab/git/remote_mirror.rb'
26422642
- 'lib/gitlab/git/repository.rb'
2643-
- 'lib/gitlab/git/rugged_impl/repository.rb'
26442643
- 'lib/gitlab/git/user.rb'
26452644
- 'lib/gitlab/git_access.rb'
26462645
- 'lib/gitlab/git_access_project.rb'
@@ -3675,7 +3674,6 @@ Layout/LineLength:
36753674
- 'spec/lib/gitlab/code_navigation_path_spec.rb'
36763675
- 'spec/lib/gitlab/composer/cache_spec.rb'
36773676
- 'spec/lib/gitlab/composer/version_index_spec.rb'
3678-
- 'spec/lib/gitlab/config_checker/puma_rugged_checker_spec.rb'
36793677
- 'spec/lib/gitlab/conflict/file_spec.rb'
36803678
- 'spec/lib/gitlab/consul/internal_spec.rb'
36813679
- 'spec/lib/gitlab/content_security_policy/config_loader_spec.rb'

.rubocop_todo/performance/map_compact.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ Performance/MapCompact:
102102
- 'lib/gitlab/database/load_balancing/service_discovery.rb'
103103
- 'lib/gitlab/git/commit.rb'
104104
- 'lib/gitlab/git/conflict/file.rb'
105-
- 'lib/gitlab/git/rugged_impl/commit.rb'
106105
- 'lib/gitlab/sql/pattern.rb'
107106
- 'lib/gitlab/url_blocker.rb'
108107
- 'qa/qa/page/component/issuable/sidebar.rb'

.rubocop_todo/rspec/context_wording.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1670,7 +1670,6 @@ RSpec/ContextWording:
16701670
- 'spec/lib/gitlab/composer/cache_spec.rb'
16711671
- 'spec/lib/gitlab/config/entry/composable_array_spec.rb'
16721672
- 'spec/lib/gitlab/config/entry/composable_hash_spec.rb'
1673-
- 'spec/lib/gitlab/config_checker/puma_rugged_checker_spec.rb'
16741673
- 'spec/lib/gitlab/consul/internal_spec.rb'
16751674
- 'spec/lib/gitlab/content_security_policy/config_loader_spec.rb'
16761675
- 'spec/lib/gitlab/cycle_analytics/permissions_spec.rb'
@@ -1771,7 +1770,6 @@ RSpec/ContextWording:
17711770
- 'spec/lib/gitlab/git/pre_receive_error_spec.rb'
17721771
- 'spec/lib/gitlab/git/raw_diff_change_spec.rb'
17731772
- 'spec/lib/gitlab/git/repository_spec.rb'
1774-
- 'spec/lib/gitlab/git/rugged_impl/use_rugged_spec.rb'
17751773
- 'spec/lib/gitlab/git/tag_spec.rb'
17761774
- 'spec/lib/gitlab/git/wiki_page_version_spec.rb'
17771775
- 'spec/lib/gitlab/git_access_snippet_spec.rb'

.rubocop_todo/rspec/feature_category.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3221,7 +3221,6 @@ RSpec/FeatureCategory:
32213221
- 'spec/lib/gitlab/config/entry/validator_spec.rb'
32223222
- 'spec/lib/gitlab/config/entry/validators/nested_array_helpers_spec.rb'
32233223
- 'spec/lib/gitlab/config_checker/external_database_checker_spec.rb'
3224-
- 'spec/lib/gitlab/config_checker/puma_rugged_checker_spec.rb'
32253224
- 'spec/lib/gitlab/conflict/file_collection_spec.rb'
32263225
- 'spec/lib/gitlab/conflict/file_spec.rb'
32273226
- 'spec/lib/gitlab/consul/internal_spec.rb'

.rubocop_todo/rspec/verified_doubles.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,6 @@ RSpec/VerifiedDoubles:
504504
- 'spec/lib/gitlab/git/blob_spec.rb'
505505
- 'spec/lib/gitlab/git/commit_spec.rb'
506506
- 'spec/lib/gitlab/git/repository_spec.rb'
507-
- 'spec/lib/gitlab/git/rugged_impl/use_rugged_spec.rb'
508507
- 'spec/lib/gitlab/git/tag_spec.rb'
509508
- 'spec/lib/gitlab/git_access_snippet_spec.rb'
510509
- 'spec/lib/gitlab/gitaly_client/commit_service_spec.rb'

.rubocop_todo/style/format_string.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,6 @@ Style/FormatString:
243243
- 'lib/gitlab/ci/parsers/sbom/cyclonedx.rb'
244244
- 'lib/gitlab/ci/status/build/waiting_for_approval.rb'
245245
- 'lib/gitlab/config_checker/external_database_checker.rb'
246-
- 'lib/gitlab/config_checker/puma_rugged_checker.rb'
247246
- 'lib/gitlab/console.rb'
248247
- 'lib/gitlab/database/async_indexes/index_creator.rb'
249248
- 'lib/gitlab/database/background_migration/batched_migration.rb'

.rubocop_todo/style/if_unless_modifier.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -817,7 +817,6 @@ Style/IfUnlessModifier:
817817
- 'lib/gitlab/git/merge_base.rb'
818818
- 'lib/gitlab/git/push.rb'
819819
- 'lib/gitlab/git/repository.rb'
820-
- 'lib/gitlab/git/rugged_impl/tree.rb'
821820
- 'lib/gitlab/git_access.rb'
822821
- 'lib/gitlab/git_access_project.rb'
823822
- 'lib/gitlab/git_access_snippet.rb'

app/assets/javascripts/ci/pipelines_page/components/pipeline_status_badge.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export default {
3232
<template>
3333
<div>
3434
<ci-icon
35-
class="gl-mb-3"
35+
class="gl-mb-2"
3636
:status="pipelineStatus"
3737
show-status-text
3838
@ciStatusBadgeClick="trackClick"

0 commit comments

Comments
 (0)