diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-12 18:17:07 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-12 18:17:07 +0000 |
| commit | 6ce6d20cf0b81275bad7bf8e95cf49bd475c5c4f (patch) | |
| tree | ba258f58856f457f94daf4b3dbf85045f4e07acc | |
| parent | c1a7bcdf1bfef9455bc58b1737f52530bf681a90 (diff) | |
| download | gitlab-ce-6ce6d20cf0b81275bad7bf8e95cf49bd475c5c4f.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
153 files changed, 724 insertions, 365 deletions
diff --git a/.rubocop_todo/layout/line_length.yml b/.rubocop_todo/layout/line_length.yml index 71c9dccb76a..a59997afc55 100644 --- a/.rubocop_todo/layout/line_length.yml +++ b/.rubocop_todo/layout/line_length.yml @@ -932,7 +932,6 @@ Layout/LineLength: - 'ee/app/controllers/projects/security/policies_controller.rb' - 'ee/app/controllers/projects/security/vulnerabilities/notes_controller.rb' - 'ee/app/controllers/subscriptions_controller.rb' - - 'ee/app/controllers/trials_controller.rb' - 'ee/app/enums/vulnerabilities/dismissal_reason_enum.rb' - 'ee/app/finders/compliance_management/merge_requests/compliance_violations_finder.rb' - 'ee/app/finders/incident_management/escalation_rules_finder.rb' diff --git a/.rubocop_todo/rspec/context_wording.yml b/.rubocop_todo/rspec/context_wording.yml index e586bcc384e..650e2c2df4c 100644 --- a/.rubocop_todo/rspec/context_wording.yml +++ b/.rubocop_todo/rspec/context_wording.yml @@ -169,7 +169,6 @@ RSpec/ContextWording: - 'ee/spec/features/protected_branches_spec.rb' - 'ee/spec/features/signup_spec.rb' - 'ee/spec/features/trial_registrations/company_information_spec.rb' - - 'ee/spec/features/trials/select_namespace_spec.rb' - 'ee/spec/features/users/login_spec.rb' - 'ee/spec/features/users/signup_spec.rb' - 'ee/spec/finders/approval_rules/group_finder_spec.rb' diff --git a/.rubocop_todo/style/empty_method.yml b/.rubocop_todo/style/empty_method.yml index 058e435c345..3950f8065c5 100644 --- a/.rubocop_todo/style/empty_method.yml +++ b/.rubocop_todo/style/empty_method.yml @@ -101,7 +101,6 @@ Style/EmptyMethod: - 'ee/app/controllers/projects/security/sast_configuration_controller.rb' - 'ee/app/controllers/projects/settings/slacks_controller.rb' - 'ee/app/controllers/subscriptions/groups_controller.rb' - - 'ee/app/controllers/trials_controller.rb' - 'ee/app/experiments/cart_abandonment_modal_experiment.rb' - 'ee/app/models/ee/epic.rb' - 'ee/app/services/feature_flag_issues/destroy_service.rb' diff --git a/.rubocop_todo/style/if_unless_modifier.yml b/.rubocop_todo/style/if_unless_modifier.yml index 435f1854957..00e7957ed9e 100644 --- a/.rubocop_todo/style/if_unless_modifier.yml +++ b/.rubocop_todo/style/if_unless_modifier.yml @@ -418,7 +418,6 @@ Style/IfUnlessModifier: - 'ee/app/controllers/projects/path_locks_controller.rb' - 'ee/app/controllers/projects/push_rules_controller.rb' - 'ee/app/controllers/projects/settings/slacks_controller.rb' - - 'ee/app/controllers/trials_controller.rb' - 'ee/app/finders/security/pipeline_vulnerabilities_finder.rb' - 'ee/app/finders/security/vulnerabilities_finder.rb' - 'ee/app/graphql/mutations/audit_events/external_audit_event_destinations/create.rb' diff --git a/.rubocop_todo/style/percent_literal_delimiters.yml b/.rubocop_todo/style/percent_literal_delimiters.yml index bc3c41ae992..cd15e2aa858 100644 --- a/.rubocop_todo/style/percent_literal_delimiters.yml +++ b/.rubocop_todo/style/percent_literal_delimiters.yml @@ -182,7 +182,6 @@ Style/PercentLiteralDelimiters: - 'ee/app/controllers/groups/protected_environments_controller.rb' - 'ee/app/controllers/projects/integrations/jira/issues_controller.rb' - 'ee/app/controllers/projects/protected_environments_controller.rb' - - 'ee/app/controllers/trials_controller.rb' - 'ee/app/finders/iterations_finder.rb' - 'ee/app/graphql/types/incident_management/oncall_rotation_date_input_type.rb' - 'ee/app/helpers/credentials_inventory_helper.rb' diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 254ffca0a53..3bca8981b9c 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -e029e3b56eacf23943a987207e8b490f45598630 +0cea93e3c9f6648076ed36ee9218e003c6402c19 diff --git a/app/assets/images/ci_favicons/canary/favicon_status_canceled.ico b/app/assets/images/ci_favicons/canary/favicon_status_canceled.ico Binary files differdeleted file mode 100644 index 48b1095370d..00000000000 --- a/app/assets/images/ci_favicons/canary/favicon_status_canceled.ico +++ /dev/null diff --git a/app/assets/images/ci_favicons/canary/favicon_status_created.ico b/app/assets/images/ci_favicons/canary/favicon_status_created.ico Binary files differdeleted file mode 100644 index 623c728faf6..00000000000 --- a/app/assets/images/ci_favicons/canary/favicon_status_created.ico +++ /dev/null diff --git a/app/assets/images/ci_favicons/canary/favicon_status_failed.ico b/app/assets/images/ci_favicons/canary/favicon_status_failed.ico Binary files differdeleted file mode 100644 index 3073fe5a761..00000000000 --- a/app/assets/images/ci_favicons/canary/favicon_status_failed.ico +++ /dev/null diff --git a/app/assets/images/ci_favicons/canary/favicon_status_manual.ico b/app/assets/images/ci_favicons/canary/favicon_status_manual.ico Binary files differdeleted file mode 100644 index 6c713d7b675..00000000000 --- a/app/assets/images/ci_favicons/canary/favicon_status_manual.ico +++ /dev/null diff --git a/app/assets/images/ci_favicons/canary/favicon_status_not_found.ico b/app/assets/images/ci_favicons/canary/favicon_status_not_found.ico Binary files differdeleted file mode 100644 index dbf855fdafd..00000000000 --- a/app/assets/images/ci_favicons/canary/favicon_status_not_found.ico +++ /dev/null diff --git a/app/assets/images/ci_favicons/canary/favicon_status_pending.ico b/app/assets/images/ci_favicons/canary/favicon_status_pending.ico Binary files differdeleted file mode 100644 index ccd00606aeb..00000000000 --- a/app/assets/images/ci_favicons/canary/favicon_status_pending.ico +++ /dev/null diff --git a/app/assets/images/ci_favicons/canary/favicon_status_preparing.ico b/app/assets/images/ci_favicons/canary/favicon_status_preparing.ico Binary files differdeleted file mode 100644 index 6cdf3ae2e36..00000000000 --- a/app/assets/images/ci_favicons/canary/favicon_status_preparing.ico +++ /dev/null diff --git a/app/assets/images/ci_favicons/canary/favicon_status_running.ico b/app/assets/images/ci_favicons/canary/favicon_status_running.ico Binary files differdeleted file mode 100644 index 968e7c4c2d4..00000000000 --- a/app/assets/images/ci_favicons/canary/favicon_status_running.ico +++ /dev/null diff --git a/app/assets/images/ci_favicons/canary/favicon_status_scheduled.ico b/app/assets/images/ci_favicons/canary/favicon_status_scheduled.ico Binary files differdeleted file mode 100644 index 5444b8e41dc..00000000000 --- a/app/assets/images/ci_favicons/canary/favicon_status_scheduled.ico +++ /dev/null diff --git a/app/assets/images/ci_favicons/canary/favicon_status_skipped.ico b/app/assets/images/ci_favicons/canary/favicon_status_skipped.ico Binary files differdeleted file mode 100644 index 7e3be35cc3a..00000000000 --- a/app/assets/images/ci_favicons/canary/favicon_status_skipped.ico +++ /dev/null diff --git a/app/assets/images/ci_favicons/canary/favicon_status_success.ico b/app/assets/images/ci_favicons/canary/favicon_status_success.ico Binary files differdeleted file mode 100644 index a1fb6e91d65..00000000000 --- a/app/assets/images/ci_favicons/canary/favicon_status_success.ico +++ /dev/null diff --git a/app/assets/images/ci_favicons/canary/favicon_status_warning.ico b/app/assets/images/ci_favicons/canary/favicon_status_warning.ico Binary files differdeleted file mode 100644 index 5d931619fb2..00000000000 --- a/app/assets/images/ci_favicons/canary/favicon_status_warning.ico +++ /dev/null diff --git a/app/assets/images/mr_favicons/favicon_status_merged.png b/app/assets/images/mr_favicons/favicon_status_merged.png Binary files differnew file mode 100644 index 00000000000..0acb2e463a9 --- /dev/null +++ b/app/assets/images/mr_favicons/favicon_status_merged.png diff --git a/app/assets/javascripts/import/constants.js b/app/assets/javascripts/import/constants.js new file mode 100644 index 00000000000..b9814b5ca60 --- /dev/null +++ b/app/assets/javascripts/import/constants.js @@ -0,0 +1,28 @@ +import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; +import { __, s__ } from '~/locale'; + +const STATISTIC_ITEMS = { + diff_note: __('Diff notes'), + issue: __('Issues'), + issue_attachment: s__('GithubImporter|Issue links'), + issue_event: __('Issue events'), + label: __('Labels'), + lfs_object: __('LFS objects'), + merge_request_attachment: s__('GithubImporter|Merge request links'), + milestone: __('Milestones'), + note: __('Notes'), + note_attachment: s__('GithubImporter|Note links'), + protected_branch: __('Protected branches'), + collaborator: s__('GithubImporter|Collaborators'), + pull_request: s__('GithubImporter|Pull requests'), + pull_request_merged_by: s__('GithubImporter|PR mergers'), + pull_request_review: s__('GithubImporter|PR reviews'), + pull_request_review_request: s__('GithubImporter|PR reviews'), + release: __('Releases'), + release_attachment: s__('GithubImporter|Release links'), +}; + +// support both camel case and snake case versions +Object.assign(STATISTIC_ITEMS, convertObjectPropsToCamelCase(STATISTIC_ITEMS)); + +export { STATISTIC_ITEMS }; diff --git a/app/assets/javascripts/import/details/components/import_details_app.vue b/app/assets/javascripts/import/details/components/import_details_app.vue index ab9242b9081..86820663025 100644 --- a/app/assets/javascripts/import/details/components/import_details_app.vue +++ b/app/assets/javascripts/import/details/components/import_details_app.vue @@ -1,7 +1,9 @@ <script> import { s__ } from '~/locale'; +import ImportDetailsTable from './import_details_table.vue'; export default { + components: { ImportDetailsTable }, props: { project: { type: Object, @@ -18,5 +20,6 @@ export default { <template> <div> <h1>{{ $options.i18n.pageTitle }}</h1> + <import-details-table /> </div> </template> diff --git a/app/assets/javascripts/import/details/components/import_details_table.vue b/app/assets/javascripts/import/details/components/import_details_table.vue new file mode 100644 index 00000000000..9ce58e8a9bc --- /dev/null +++ b/app/assets/javascripts/import/details/components/import_details_table.vue @@ -0,0 +1,106 @@ +<script> +import { GlEmptyState, GlIcon, GlLink, GlTable } from '@gitlab/ui'; +import { __ } from '~/locale'; + +import PaginationBar from '~/vue_shared/components/pagination_bar/pagination_bar.vue'; +import { STATISTIC_ITEMS } from '../../constants'; + +const DEFAULT_PAGE_SIZE = 20; + +export default { + components: { + GlEmptyState, + GlIcon, + GlLink, + GlTable, + PaginationBar, + }, + STATISTIC_ITEMS, + LOCAL_STORAGE_KEY: 'gl-import-details-page-size', + fields: [ + { + key: 'type', + label: __('Type'), + tdClass: 'gl-white-space-nowrap', + }, + { + key: 'title', + label: __('Title'), + tdClass: 'gl-md-w-30 gl-word-break-word', + }, + { + key: 'url', + label: __('URL'), + tdClass: 'gl-white-space-nowrap', + }, + { + key: 'details', + label: __('Details'), + }, + ], + data() { + return { + page: 1, + perPage: DEFAULT_PAGE_SIZE, + }; + }, + computed: { + items() { + return []; + }, + + hasItems() { + return this.items.length > 0; + }, + + pageInfo() { + const mockPageInfo = { + page: this.page, + perPage: this.perPage, + totalPages: this.page, + total: this.items.length, + }; + return mockPageInfo; + }, + }, + + methods: { + setPage(page) { + this.page = page; + }, + + setPageSize(size) { + this.perPage = size; + this.page = 1; + }, + }, +}; +</script> + +<template> + <div> + <gl-table :fields="$options.fields" :items="items" class="gl-mt-5" show-empty> + <template #empty> + <gl-empty-state :title="s__('Import|No import details')" /> + </template> + + <template #cell(type)="{ item: { type } }"> + {{ $options.STATISTIC_ITEMS[type] }} + </template> + <template #cell(url)="{ item: { url } }"> + <gl-link v-if="url" :href="url" target="_blank"> + {{ url }} + <gl-icon name="external-link" /> + </gl-link> + </template> + </gl-table> + <pagination-bar + v-if="hasItems" + :page-info="pageInfo" + class="gl-mt-5" + :storage-key="$options.LOCAL_STORAGE_KEY" + @set-page="setPage" + @set-page-size="setPageSize" + /> + </div> +</template> diff --git a/app/assets/javascripts/import_entities/components/import_status.vue b/app/assets/javascripts/import_entities/components/import_status.vue index f4facbba273..c06258de50c 100644 --- a/app/assets/javascripts/import_entities/components/import_status.vue +++ b/app/assets/javascripts/import_entities/components/import_status.vue @@ -1,32 +1,9 @@ <script> import { GlAccordion, GlAccordionItem, GlBadge, GlIcon } from '@gitlab/ui'; -import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; import { __, s__ } from '~/locale'; -import { STATUSES } from '../constants'; - -const STATISTIC_ITEMS = { - diff_note: __('Diff notes'), - issue: __('Issues'), - issue_attachment: s__('GithubImporter|Issue links'), - issue_event: __('Issue events'), - label: __('Labels'), - lfs_object: __('LFS objects'), - merge_request_attachment: s__('GithubImporter|Merge request links'), - milestone: __('Milestones'), - note: __('Notes'), - note_attachment: s__('GithubImporter|Note links'), - protected_branch: __('Protected branches'), - collaborator: s__('GithubImporter|Collaborators'), - pull_request: s__('GithubImporter|Pull requests'), - pull_request_merged_by: s__('GithubImporter|PR mergers'), - pull_request_review: s__('GithubImporter|PR reviews'), - pull_request_review_request: s__('GithubImporter|PR reviews'), - release: __('Releases'), - release_attachment: s__('GithubImporter|Release links'), -}; -// support both camel case and snake case versions -Object.assign(STATISTIC_ITEMS, convertObjectPropsToCamelCase(STATISTIC_ITEMS)); +import { STATISTIC_ITEMS } from '~/import/constants'; +import { STATUSES } from '../constants'; const SCHEDULED_STATUS = { icon: 'status-scheduled', diff --git a/app/assets/javascripts/performance_bar/components/performance_bar_app.vue b/app/assets/javascripts/performance_bar/components/performance_bar_app.vue index 2c30467a026..fac070d6e47 100644 --- a/app/assets/javascripts/performance_bar/components/performance_bar_app.vue +++ b/app/assets/javascripts/performance_bar/components/performance_bar_app.vue @@ -133,14 +133,20 @@ export default { const fileName = this.requests[0].displayName; return `${fileName}_perf_bar_${Date.now()}.json`; }, - memoryReportPath() { - return mergeUrlParams({ performance_bar: 'memory' }, window.location.href); - }, showZoekt() { return document.body.dataset.page === 'search:show'; }, showFlamegraphButtons() { - return this.currentRequest.details && this.isGetRequest(this.currentRequestId); + return this.isGetRequest(this.currentRequestId); + }, + showMemoryReportButton() { + return this.isGetRequest(this.currentRequestId) && this.env === 'development'; + }, + memoryReportPath() { + return mergeUrlParams( + { performance_bar: 'memory' }, + this.store.findRequest(this.currentRequestId).fullUrl, + ); }, }, created() { @@ -225,11 +231,7 @@ export default { >{{ s__('PerformanceBar|Download') }}</gl-link > </div> - <div - v-if="currentRequest.details && env === 'development'" - id="peek-memory-report" - class="view" - > + <div v-if="showMemoryReportButton" id="peek-memory-report" class="view"> <gl-link class="gl-text-blue-200" :href="memoryReportPath">{{ s__('PerformanceBar|Memory report') }}</gl-link> diff --git a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue index df6e0ba6b34..b90ba0142c6 100644 --- a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue +++ b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue @@ -421,8 +421,8 @@ export default { ); }, setFaviconHelper() { - if (this.mr.ciStatusFaviconPath) { - return setFaviconOverlay(this.mr.ciStatusFaviconPath); + if (this.mr.faviconOverlayPath) { + return setFaviconOverlay(this.mr.faviconOverlayPath); } return Promise.resolve(); }, diff --git a/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js b/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js index c00841f1692..a7758191315 100644 --- a/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js +++ b/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js @@ -140,7 +140,7 @@ export default class MergeRequestStore { this.isPipelineActive = data.pipeline ? data.pipeline.active : false; this.isPipelineBlocked = data.only_allow_merge_if_pipeline_succeeds && pipelineStatus?.group === 'manual'; - this.ciStatusFaviconPath = pipelineStatus ? pipelineStatus.favicon : null; + this.faviconOverlayPath = data.favicon_overlay_path; this.terraformReportsPath = data.terraform_reports_path; this.testResultsPath = data.test_reports_path; this.accessibilityReportPath = data.accessibility_report_path; diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb index 3c52868eab4..9ed52df69f1 100644 --- a/app/helpers/merge_requests_helper.rb +++ b/app/helpers/merge_requests_helper.rb @@ -233,24 +233,40 @@ module MergeRequestsHelper end def merge_request_source_branch(merge_request) + fork_icon = if merge_request.for_fork? + title = _('The source project is a fork') + content_tag(:span, class: 'gl-vertical-align-middle gl-mr-n2 has-tooltip', title: title) do + sprite_icon('fork', size: 12, css_class: 'gl-ml-1 has-tooltip') + end + else + '' + end + branch = if merge_request.for_fork? - "#{merge_request.source_project_path}:#{merge_request.source_branch}" + _('%{fork_icon} %{source_project_path}:%{source_branch}').html_safe % { fork_icon: fork_icon.html_safe, source_project_path: merge_request.source_project_path.html_safe, source_branch: merge_request.source_branch.html_safe } else merge_request.source_branch end + branch_title = if merge_request.for_fork? + _('%{source_project_path}:%{source_branch}').html_safe % { source_project_path: merge_request.source_project_path.html_safe, source_branch: merge_request.source_branch.html_safe } + else + merge_request.source_branch + end + branch_path = if merge_request.source_project project_tree_path(merge_request.source_project, merge_request.source_branch) else '' end - link_to branch, branch_path, title: branch, class: 'gl-text-blue-500! gl-font-monospace gl-bg-blue-50 gl-rounded-base gl-font-sm gl-px-2 gl-display-inline-block gl-text-truncate gl-max-w-26 gl-mx-2' + link_to branch, branch_path, title: branch_title, class: 'gl-text-blue-500! gl-font-monospace gl-bg-blue-50 gl-rounded-base gl-font-sm gl-px-2 gl-display-inline-block gl-text-truncate gl-max-w-26 gl-mx-2' end def merge_request_header(project, merge_request) link_to_author = link_to_member(project, merge_request.author, size: 24, extra_class: 'gl-font-weight-bold gl-mr-2', avatar: false) copy_button = clipboard_button(text: merge_request.source_branch, title: _('Copy branch name'), class: 'btn btn-default btn-sm gl-button btn-default-tertiary btn-icon gl-display-none! gl-md-display-inline-block! js-source-branch-copy') + target_branch = link_to merge_request.target_branch, project_tree_path(merge_request.target_project, merge_request.target_branch), title: merge_request.target_branch, class: 'gl-text-blue-500! gl-font-monospace gl-bg-blue-50 gl-rounded-base gl-font-sm gl-px-2 gl-display-inline-block gl-text-truncate gl-max-w-26 gl-mx-2' _('%{author} requested to merge %{source_branch} %{copy_button} into %{target_branch} %{created_at}').html_safe % { author: link_to_author.html_safe, source_branch: merge_request_source_branch(merge_request).html_safe, copy_button: copy_button.html_safe, target_branch: target_branch.html_safe, created_at: time_ago_with_tooltip(merge_request.created_at, html_class: 'gl-display-inline-block').html_safe } diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb index 644e9c31eb4..8c7b0193199 100644 --- a/app/models/ci/pipeline.rb +++ b/app/models/ci/pipeline.rb @@ -399,6 +399,7 @@ module Ci scope :created_before_id, -> (id) { where(arel_table[:id].lt(id)) } scope :before_pipeline, -> (pipeline) { created_before_id(pipeline.id).outside_pipeline_family(pipeline) } scope :with_pipeline_source, -> (source) { where(source: source) } + scope :preload_pipeline_metadata, -> { preload(:pipeline_metadata) } scope :outside_pipeline_family, ->(pipeline) do where.not(id: pipeline.same_family_pipeline_ids) diff --git a/app/serializers/detailed_status_entity.rb b/app/serializers/detailed_status_entity.rb index ed8ac9f40f7..1f1a805af67 100644 --- a/app/serializers/detailed_status_entity.rb +++ b/app/serializers/detailed_status_entity.rb @@ -35,7 +35,7 @@ class DetailedStatusEntity < Grape::Entity expose :favicon, documentation: { type: 'string', example: '/assets/ci_favicons/favicon_status_success.png' } do |status| - Gitlab::Favicon.status_overlay(status.favicon) + Gitlab::Favicon.ci_status_overlay(status.favicon) end expose :action, if: -> (status, _) { status.has_action? } do diff --git a/app/serializers/merge_request_poll_cached_widget_entity.rb b/app/serializers/merge_request_poll_cached_widget_entity.rb index 33079905ed2..a9c17402515 100644 --- a/app/serializers/merge_request_poll_cached_widget_entity.rb +++ b/app/serializers/merge_request_poll_cached_widget_entity.rb @@ -153,6 +153,19 @@ class MergeRequestPollCachedWidgetEntity < IssuableEntity end end + expose :favicon_overlay_path, + documentation: { type: 'string', + example: '/assets/ci_favicons/favicon_status_success.png' } do |merge_request| + if merge_request.state == 'merged' + status_name = "favicon_status_#{merge_request.state}" + Gitlab::Favicon.mr_status_overlay(status_name) + else + pipeline = merge_request.actual_head_pipeline + status = pipeline&.detailed_status(request.current_user) + Gitlab::Favicon.ci_status_overlay(status.favicon) if status + end + end + private delegate :current_user, to: :request diff --git a/app/services/ci/retry_job_service.rb b/app/services/ci/retry_job_service.rb index 0764eb95907..e3cbba6de23 100644 --- a/app/services/ci/retry_job_service.rb +++ b/app/services/ci/retry_job_service.rb @@ -32,10 +32,10 @@ module Ci new_job.set_enqueue_immediately! end - start_pipeline_proc = -> { start_pipeline(job, new_job) } if start_pipeline && start_pipeline_after_commit? + start_pipeline_proc = -> { start_pipeline(job, new_job) } if start_pipeline new_job.run_after_commit do - start_pipeline_proc.call if start_pipeline_proc + start_pipeline_proc&.call ::Ci::CopyCrossDatabaseAssociationsService.new.execute(job, new_job) @@ -69,8 +69,6 @@ module Ci next if new_job.failed? ResetSkippedJobsService.new(project, current_user).execute(job) - - start_pipeline(job, new_job) unless start_pipeline_after_commit? end end @@ -84,11 +82,6 @@ module Ci Ci::PipelineCreation::StartPipelineService.new(job.pipeline).execute new_job.reset end - - def start_pipeline_after_commit? - Feature.enabled?(:retry_job_start_pipeline_after_commit, project) - end - strong_memoize_attr :start_pipeline_after_commit? end end diff --git a/config/feature_flags/development/openai_experimentation.yml b/config/feature_flags/development/openai_experimentation.yml index b3585038c07..8f0bb6df036 100644 --- a/config/feature_flags/development/openai_experimentation.yml +++ b/config/feature_flags/development/openai_experimentation.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/116364 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/403855 milestone: '15.11' type: development -group: group::ai_enablement +group: group::ai-enablement default_enabled: false diff --git a/config/feature_flags/development/retry_job_start_pipeline_after_commit.yml b/config/feature_flags/development/pipeline_name_in_api.yml index dce73e16119..cb22fca2932 100644 --- a/config/feature_flags/development/retry_job_start_pipeline_after_commit.yml +++ b/config/feature_flags/development/pipeline_name_in_api.yml @@ -1,8 +1,8 @@ --- -name: retry_job_start_pipeline_after_commit -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/116480 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/403934 +name: pipeline_name_in_api +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/115310 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/398131 milestone: '15.11' type: development -group: group::pipeline execution +group: group::delivery default_enabled: false diff --git a/config/feature_flags/development/summarize_comments.yml b/config/feature_flags/development/summarize_comments.yml new file mode 100644 index 00000000000..e0f8b223895 --- /dev/null +++ b/config/feature_flags/development/summarize_comments.yml @@ -0,0 +1,8 @@ +--- +name: summarize_comments +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/117296 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/406758 +milestone: '15.11' +type: development +group: group::ai-enablement +default_enabled: false diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml index d380a721a4c..e4b1162a21d 100644 --- a/config/sidekiq_queues.yml +++ b/config/sidekiq_queues.yml @@ -297,6 +297,8 @@ - 1 - - ldap_group_sync - 2 +- - llm_completion + - 1 - - mail_scheduler - 2 - - mailers diff --git a/db/post_migrate/20230406041555_allow_null_file_md5_to_debian_project_component_files.rb b/db/post_migrate/20230406041555_allow_null_file_md5_to_debian_project_component_files.rb new file mode 100644 index 00000000000..d03f68e22ab --- /dev/null +++ b/db/post_migrate/20230406041555_allow_null_file_md5_to_debian_project_component_files.rb @@ -0,0 +1,11 @@ +# frozen_string_literal: true + +class AllowNullFileMd5ToDebianProjectComponentFiles < Gitlab::Database::Migration[2.1] + def up + change_column_null :packages_debian_project_component_files, :file_md5, true + end + + def down + # There may now be nulls in the table, so we cannot re-add the constraint here. + end +end diff --git a/db/post_migrate/20230406041629_allow_null_file_md5_to_debian_group_component_files.rb b/db/post_migrate/20230406041629_allow_null_file_md5_to_debian_group_component_files.rb new file mode 100644 index 00000000000..15e8414f0bd --- /dev/null +++ b/db/post_migrate/20230406041629_allow_null_file_md5_to_debian_group_component_files.rb @@ -0,0 +1,11 @@ +# frozen_string_literal: true + +class AllowNullFileMd5ToDebianGroupComponentFiles < Gitlab::Database::Migration[2.1] + def up + change_column_null :packages_debian_group_component_files, :file_md5, true + end + + def down + # There may now be nulls in the table, so we cannot re-add the constraint here. + end +end diff --git a/db/schema_migrations/20230406041555 b/db/schema_migrations/20230406041555 new file mode 100644 index 00000000000..cede3b1d25e --- /dev/null +++ b/db/schema_migrations/20230406041555 @@ -0,0 +1 @@ +75a2776017e8d2c015021ca056c09d2b5f7776f6443c59d1bd164519575c05ba
\ No newline at end of file diff --git a/db/schema_migrations/20230406041629 b/db/schema_migrations/20230406041629 new file mode 100644 index 00000000000..0d77ae52a24 --- /dev/null +++ b/db/schema_migrations/20230406041629 @@ -0,0 +1 @@ +e1726eb5b20b230f4b37ef56e0f3dd512bdcea3e67a9ba5a1725363bb17b79e6
\ No newline at end of file diff --git a/db/structure.sql b/db/structure.sql index 1fe90c6f031..d5d04ff6878 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -19276,7 +19276,7 @@ CREATE TABLE packages_debian_group_component_files ( compression_type smallint, file_store smallint DEFAULT 1 NOT NULL, file text NOT NULL, - file_md5 bytea NOT NULL, + file_md5 bytea, file_sha256 bytea NOT NULL, CONSTRAINT check_839e1685bc CHECK ((char_length(file) <= 255)) ); @@ -19401,7 +19401,7 @@ CREATE TABLE packages_debian_project_component_files ( compression_type smallint, file_store smallint DEFAULT 1 NOT NULL, file text NOT NULL, - file_md5 bytea NOT NULL, + file_md5 bytea, file_sha256 bytea NOT NULL, CONSTRAINT check_e5af03fa2d CHECK ((char_length(file) <= 255)) ); diff --git a/doc/administration/geo/disaster_recovery/runbooks/planned_failover_multi_node.md b/doc/administration/geo/disaster_recovery/runbooks/planned_failover_multi_node.md index 5480775a683..feb5e030b80 100644 --- a/doc/administration/geo/disaster_recovery/runbooks/planned_failover_multi_node.md +++ b/doc/administration/geo/disaster_recovery/runbooks/planned_failover_multi_node.md @@ -6,7 +6,7 @@ type: howto --- WARNING: -This runbook is in [**Alpha**](../../../../policy/alpha-beta-support.md#experiment). For complete, production-ready documentation, see the +This runbook is an [Experiment](../../../../policy/alpha-beta-support.md#experiment). For complete, production-ready documentation, see the [disaster recovery documentation](../index.md). # Disaster Recovery (Geo) promotion runbooks **(PREMIUM SELF)** diff --git a/doc/administration/geo/disaster_recovery/runbooks/planned_failover_single_node.md b/doc/administration/geo/disaster_recovery/runbooks/planned_failover_single_node.md index 1e8dde87239..19150027cca 100644 --- a/doc/administration/geo/disaster_recovery/runbooks/planned_failover_single_node.md +++ b/doc/administration/geo/disaster_recovery/runbooks/planned_failover_single_node.md @@ -6,7 +6,7 @@ type: howto --- WARNING: -This runbook is in [**Alpha**](../../../../policy/alpha-beta-support.md#experiment). For complete, production-ready documentation, see the +This runbook is an [Experiment](../../../../policy/alpha-beta-support.md#experiment). For complete, production-ready documentation, see the [disaster recovery documentation](../index.md). # Disaster Recovery (Geo) promotion runbooks **(PREMIUM SELF)** diff --git a/doc/administration/operations/gitlab_sshd.md b/doc/administration/operations/gitlab_sshd.md index 3537ae8bf6b..b15e9cade1a 100644 --- a/doc/administration/operations/gitlab_sshd.md +++ b/doc/administration/operations/gitlab_sshd.md @@ -6,7 +6,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w # `gitlab-sshd` **(FREE SELF)** -> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/299109) in GitLab 14.5 as an **Alpha** release for self-managed customers. +> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/299109) in GitLab 14.5 as an Experiment for self-managed customers. > - Ready for production use with [Cloud Native GitLab in GitLab 15.1](https://gitlab.com/gitlab-org/charts/gitlab/-/issues/2540) and [Omnibus GitLab in GitLab 15.9](https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/5937). `gitlab-sshd` is [a standalone SSH server](https://gitlab.com/gitlab-org/gitlab-shell/-/tree/main/internal/sshd) diff --git a/doc/administration/operations/puma.md b/doc/administration/operations/puma.md index eea391e56c4..5ff9208ecb9 100644 --- a/doc/administration/operations/puma.md +++ b/doc/administration/operations/puma.md @@ -99,7 +99,7 @@ To change the worker timeout to 600 seconds: ## Disable Puma clustered mode in memory-constrained environments WARNING: -This is an experimental [Alpha feature](../../policy/alpha-beta-support.md#experiment) and subject to change without notice. The feature +This feature is an [Experiment](../../policy/alpha-beta-support.md#experiment) and subject to change without notice. The feature is not ready for production use. If you want to use this feature, you should test outside of production first. See the [known issues](#puma-single-mode-known-issues) for additional details. diff --git a/doc/administration/postgresql/multiple_databases.md b/doc/administration/postgresql/multiple_databases.md index af76c03492d..857fd4fc9c5 100644 --- a/doc/administration/postgresql/multiple_databases.md +++ b/doc/administration/postgresql/multiple_databases.md @@ -15,7 +15,7 @@ By default, GitLab uses a single application database, referred to as the `main` To scale GitLab, you can configure GitLab to use multiple application databases. -Due to [known issues](#known-issues), configuring GitLab with multiple databases is in [**Alpha**](../../policy/alpha-beta-support.md#experiment). +Due to [known issues](#known-issues), configuring GitLab with multiple databases is an [Experiment](../../policy/alpha-beta-support.md#experiment). After you have set up multiple databases, GitLab uses a second application database for [CI/CD features](../../ci/index.md), referred to as the `ci` database. diff --git a/doc/api/dependencies.md b/doc/api/dependencies.md index 651c5b74503..47db8645be1 100644 --- a/doc/api/dependencies.md +++ b/doc/api/dependencies.md @@ -7,7 +7,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w # Dependencies API **(ULTIMATE)** WARNING: -This API is in an [Alpha](../policy/alpha-beta-support.md#experiment) stage and considered unstable. +This API is in an [Experiment](../policy/alpha-beta-support.md#experiment) and considered unstable. The response payload may be subject to change or breakage across GitLab releases. diff --git a/doc/api/pipelines.md b/doc/api/pipelines.md index 7049d3c3927..88a0b601a42 100644 --- a/doc/api/pipelines.md +++ b/doc/api/pipelines.md @@ -15,7 +15,14 @@ Read more on [pagination](rest/index.md#pagination). ## List project pipelines -> `iid` in response [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/342223) in GitLab 14.6. +> - `iid` in response [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/342223) in GitLab 14.6. +> - `name` in request and response [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/115310) in GitLab 15.11 [with a flag](../administration/feature_flags.md) named `pipeline_name_in_api`. Disabled by default. + +FLAG: +On self-managed GitLab, by default the `name` field is not available. +To make it available, ask an administrator to [enable the feature flag](../administration/feature_flags.md) +named `pipeline_name_in_api`. This feature is not ready for production use. +On GitLab.com, this feature is not available. List pipelines in a project. Child pipelines are not included in the results, but you can [get child pipeline](pipelines.md#get-a-single-pipeline) individually. @@ -36,6 +43,7 @@ GET /projects/:id/pipelines | `username`| string | no | The username of the user who triggered pipelines | | `updated_after` | datetime | no | Return pipelines updated after the specified date. Expected in ISO 8601 format (`2019-03-15T08:00:00Z`). | | `updated_before` | datetime | no | Return pipelines updated before the specified date. Expected in ISO 8601 format (`2019-03-15T08:00:00Z`). | +| `name` | string | no | Return pipelines with the specified name. Introduced in GitLab 15.11, not available by default. | | `order_by`| string | no | Order pipelines by `id`, `status`, `ref`, `updated_at` or `user_id` (default: `id`) | | `sort` | string | no | Sort pipelines in `asc` or `desc` order (default: `desc`) | @@ -55,6 +63,7 @@ Example of response "source": "push", "ref": "new-pipeline", "sha": "a91957a858320c0e17f3a0eca7cfacbff50ea29a", + "name": "Build pipeline", "web_url": "https://example.com/foo/bar/pipelines/47", "created_at": "2016-08-11T11:28:34.085Z", "updated_at": "2016-08-11T11:32:35.169Z" @@ -67,6 +76,7 @@ Example of response "source": "web", "ref": "new-pipeline", "sha": "eb94b618fb5865b26e80fdd8ae531b7a63ad851a", + "name": "Build pipeline", "web_url": "https://example.com/foo/bar/pipelines/48", "created_at": "2016-08-12T10:06:04.561Z", "updated_at": "2016-08-12T10:09:56.223Z" diff --git a/doc/api/vulnerability_exports.md b/doc/api/vulnerability_exports.md index 7084de09f61..28053eb20b6 100644 --- a/doc/api/vulnerability_exports.md +++ b/doc/api/vulnerability_exports.md @@ -9,7 +9,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/197494) in GitLab 12.10. [Updated](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/30397) in GitLab 13.0. WARNING: -This API is in an [Alpha](../policy/alpha-beta-support.md#experiment) stage and considered unstable. +This API is in an [Experiment](../policy/alpha-beta-support.md#experiment) and considered unstable. The response payload may be subject to change or breakage across GitLab releases. diff --git a/doc/ci/runners/saas/windows_saas_runner.md b/doc/ci/runners/saas/windows_saas_runner.md index 9f58c905c62..6e4ffc036b0 100644 --- a/doc/ci/runners/saas/windows_saas_runner.md +++ b/doc/ci/runners/saas/windows_saas_runner.md @@ -4,9 +4,9 @@ group: Runner info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments --- -# SaaS runners on Windows (beta) **(FREE SAAS)** +# SaaS runners on Windows (Beta) **(FREE SAAS)** -SaaS runners on Windows are in [beta](../../../policy/alpha-beta-support.md#beta) +SaaS runners on Windows are in [Beta](../../../policy/alpha-beta-support.md#beta) and shouldn't be used for production workloads. During this beta period, the [shared runner quota for CI/CD minutes](../../pipelines/cicd_minutes.md) @@ -126,7 +126,7 @@ test: ## Limitations and known issues -- All the limitations mentioned in our [beta definition](../../../policy/alpha-beta-support.md#beta). +- All the limitations mentioned in our [Beta definition](../../../policy/alpha-beta-support.md#beta). - The average provisioning time for a new Windows VM is 5 minutes. This means that you may notice slower build start times on the Windows runner fleet during the beta. In a future diff --git a/doc/development/contributing/design.md b/doc/development/contributing/design.md index 7cd220c606c..d68bc194266 100644 --- a/doc/development/contributing/design.md +++ b/doc/development/contributing/design.md @@ -73,7 +73,7 @@ Check visual design properties using your browser's _elements inspector_ ([Chrom guidelines. - _Optionally_ consider [dark mode](../../user/profile/preferences.md#dark-mode). [^1] - [^1]: You're not required to design for [dark mode](../../user/profile/preferences.md#dark-mode) while the feature is in [alpha](../../policy/alpha-beta-support.md#experiment). The [UX Foundations team](https://about.gitlab.com/direction/manage/foundations/) plans to improve the dark mode in the future. Until we integrate [Pajamas](https://design.gitlab.com/) components into the product and the underlying design strategy is in place to support dark mode, we cannot guarantee that we won't introduce bugs and debt to this mode. At your discretion, evaluate the need to create dark mode patches. + [^1]: You're not required to design for [dark mode](../../user/profile/preferences.md#dark-mode) while the feature is an [Experiment](../../policy/alpha-beta-support.md#experiment). The [UX Foundations team](https://about.gitlab.com/direction/manage/foundations/) plans to improve the dark mode in the future. Until we integrate [Pajamas](https://design.gitlab.com/) components into the product and the underlying design strategy is in place to support dark mode, we cannot guarantee that we won't introduce bugs and debt to this mode. At your discretion, evaluate the need to create dark mode patches. ### States diff --git a/doc/development/documentation/alpha_beta.md b/doc/development/documentation/alpha_beta.md index 47f9090adbc..d421aae3cb9 100644 --- a/doc/development/documentation/alpha_beta.md +++ b/doc/development/documentation/alpha_beta.md @@ -4,15 +4,15 @@ stage: none group: unassigned --- -# Document Alpha, Beta, LA features +# Documenting Experiment and Beta features Some features are not generally available and are instead considered -[Alpha, Beta, or Limited Availability](../../policy/alpha-beta-support.md). +[Experiment or Beta](../../policy/alpha-beta-support.md). When you document a feature in one of these three statuses: -- Add `(Alpha)`, `(Beta)`, or `(Limited Availability)` in parentheses after the page or topic title. -- Do not include `(Alpha)`, `(Beta)`, or `(Limited Availability)` in the left nav. +- Add `(Experiment)` or `(Beta)` in parentheses after the page or topic title. +- Do not include `(Experiment)` or `(Beta)` in the left nav. - Ensure the version history lists the feature's status. These features are usually behind a feature flag, which follow [these documentation guidelines](feature_flags.md). @@ -23,9 +23,9 @@ the `FLAG:` note should be above these details. For example: ```markdown -## Great new feature (Alpha) +## Great new feature (Experiment) -> [Introduced](link) in GitLab 15.10. This feature is in [Alpha](<link_to>/policy/alpha-beta-support.md). +> [Introduced](link) in GitLab 15.10. This feature is an [Experiment](<link_to>/policy/alpha-beta-support.md). FLAG: On self-managed GitLab, by default this feature is not available. @@ -34,7 +34,7 @@ On GitLab.com, this feature is not available. This feature is not ready for prod Use this great new feature when you need to do this new thing. -This feature is in [Alpha](<link_to>/policy/alpha-beta-support.md). To join +This feature is an [Experiment](<link_to>/policy/alpha-beta-support.md). To join the list of users testing this feature, do this thing. If you find a bug, [open an issue](link). ``` diff --git a/doc/development/documentation/feature_flags.md b/doc/development/documentation/feature_flags.md index 986252eedac..854faa839ef 100644 --- a/doc/development/documentation/feature_flags.md +++ b/doc/development/documentation/feature_flags.md @@ -17,7 +17,7 @@ When the state of a feature flag changes, the developer who made the change Every feature introduced to the codebase, even if it's behind a disabled feature flag, must be documented. For more information, see -[the discussion that led to this decision](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/47917#note_459984428). [Alpha, Beta, or Limited Availability](../../policy/alpha-beta-support.md) features are usually behind a feature flag, and must also be documented. For more information, see [Document Alpha, Beta, LA features](alpha_beta.md). +[the discussion that led to this decision](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/47917#note_459984428). [Experiment or Beta](../../policy/alpha-beta-support.md) features are usually behind a feature flag, and must also be documented. For more information, see [Document Experiment or Beta features](alpha_beta.md). When the feature is [implemented in multiple merge requests](../feature_flags/index.md#feature-flags-in-gitlab-development), discuss the plan with your technical writer. diff --git a/doc/development/documentation/styleguide/word_list.md b/doc/development/documentation/styleguide/word_list.md index 9a7bf616c46..b644355c54d 100644 --- a/doc/development/documentation/styleguide/word_list.md +++ b/doc/development/documentation/styleguide/word_list.md @@ -149,13 +149,6 @@ Instead of: This phrasing is more active and is from the user perspective, rather than the person who implemented the feature. [View details in the Microsoft style guide](https://learn.microsoft.com/en-us/style-guide/a-z-word-list-term-collections/a/allow-allows). -## Alpha - -Use uppercase for **Alpha**. For example: **The XYZ feature is in Alpha.** or **This Alpha release is ready to test.** - -You might also want to link to [this section](../../../policy/alpha-beta-support.md#experiment) -in the handbook when writing about Alpha features. - ## analytics Use lowercase for **analytics** and its variations, like **contribution analytics** and **issue analytics**. @@ -498,6 +491,13 @@ Instead of: Use **expand** instead of **open** when you are talking about expanding or collapsing a section in the UI. +## Experiment + +Use uppercase for **Experiment**. For example: **The XYZ feature is an Experiment.** or **This Experiment is ready to test.** + +You might also want to link to [this section](../../../policy/alpha-beta-support.md#experiment) +in the handbook when writing about Experiment features. + ## FAQ We want users to find information quickly, and they rarely search for the term **FAQ**. diff --git a/doc/development/fe_guide/customizable_dashboards.md b/doc/development/fe_guide/customizable_dashboards.md index 7b9edcfa659..9e45c660745 100644 --- a/doc/development/fe_guide/customizable_dashboards.md +++ b/doc/development/fe_guide/customizable_dashboards.md @@ -6,7 +6,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w # Customizable dashboards -> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/98610) in GitLab 15.5 as an [Alpha feature](../../policy/alpha-beta-support.md#experiment). +> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/98610) in GitLab 15.5 as an [Experiment](../../policy/alpha-beta-support.md#experiment). Customizable dashboards provide a dashboard structure that allows users to create their own dashboards and commit the structure to a repository. diff --git a/doc/development/graphql_guide/reviewing.md b/doc/development/graphql_guide/reviewing.md index c98158a43be..9c32179a89d 100644 --- a/doc/development/graphql_guide/reviewing.md +++ b/doc/development/graphql_guide/reviewing.md @@ -28,7 +28,7 @@ Try running the query in [GraphiQL](../api_graphql_styleguide.md#graphiql) on yo Check the MR for any [breaking changes](../api_graphql_styleguide.md#breaking-changes). -If a feature is marked [Alpha](../api_graphql_styleguide.md#mark-schema-items-as-alpha), you can make breaking changes immediately, with no deprecation period. +If a feature is marked as an [Experiment](../api_graphql_styleguide.md#mark-schema-items-as-alpha), you can make breaking changes immediately, with no deprecation period. For more information, see [deprecation and removal process](../../api/graphql/index.md#deprecation-and-removal-process). @@ -45,7 +45,7 @@ Changes to the generated API docs require a technical writer review. ### Changelog -Public-facing changes that are not marked as [Alpha](../api_graphql_styleguide.md#mark-schema-items-as-alpha) require a [changelog entry](../changelog.md). +Public-facing changes that are not marked as an [Experiment](../api_graphql_styleguide.md#mark-schema-items-as-alpha) require a [changelog entry](../changelog.md). ### Use the framework diff --git a/doc/install/openshift_and_gitlab/index.md b/doc/install/openshift_and_gitlab/index.md index 6086716be1c..330832ec2ce 100644 --- a/doc/install/openshift_and_gitlab/index.md +++ b/doc/install/openshift_and_gitlab/index.md @@ -31,7 +31,7 @@ The GitLab Operator does not include the GitLab Runner. To install and manage a ### Secure -- [License Compliance](../../user/compliance/license_compliance/index.md) +- [License Compliance via the `License-Scanning.gitlab-ci.yml` CI/CD template](../../user/compliance/license_compliance/index.md). Note that [license scanning of CycloneDX files](../../user/compliance/license_scanning_of_cyclonedx_files/index.md) is supported on OpenShift. - [Code Quality scanning](../../ci/testing/code_quality.md) - [Operational Container Scanning](../../user/clusters/agent/vulnerabilities.md) (Note: Pipeline [Container Scanning](../../user/application_security/container_scanning/index.md) is supported) diff --git a/doc/integration/saml.md b/doc/integration/saml.md index 2fdace32553..ef32311f85d 100644 --- a/doc/integration/saml.md +++ b/doc/integration/saml.md @@ -51,7 +51,7 @@ For more information on: 1. Configure the following attributes so your SAML users cannot change them: - - [`NameID`](../user/group/saml_sso/index.md#nameid). + - [`NameID`](../user/group/saml_sso/index.md#manage-user-saml-identity). - `Email` when used with `omniauth_auto_link_saml_user`. If users can change these attributes, they can sign in as other authorized users. @@ -134,7 +134,7 @@ For more information on: 1. Configure the following attributes so your SAML users cannot change them: - - [`NameID`](../user/group/saml_sso/index.md#nameid). + - [`NameID`](../user/group/saml_sso/index.md#manage-user-saml-identity). - `Email` when used with `omniauth_auto_link_saml_user`. If users can change these attributes, they can sign in as other authorized users. @@ -226,7 +226,7 @@ For more information on: 1. Configure the following attributes so your SAML users cannot change them: - - [`NameID`](../user/group/saml_sso/index.md#nameid). + - [`NameID`](../user/group/saml_sso/index.md#manage-user-saml-identity). - `Email` when used with `omniauth_auto_link_saml_user`. If users can change these attributes, they can sign in as other authorized users. @@ -306,7 +306,7 @@ For more information on: 1. Configure the following attributes so your SAML users cannot change them: - - [`NameID`](../user/group/saml_sso/index.md#nameid). + - [`NameID`](../user/group/saml_sso/index.md#manage-user-saml-identity). - `Email` when used with `omniauth_auto_link_saml_user`. If users can change these attributes, they can sign in as other authorized users. @@ -382,7 +382,7 @@ To configure a SAML application on your IdP, you need at least the following inf - Assertion consumer service URL. - Issuer. -- [`NameID`](../user/group/saml_sso/index.md#nameid). +- [`NameID`](../user/group/saml_sso/index.md#manage-user-saml-identity). - [Email address claim](#configure-assertions). For an example configuration, see [set up identity providers](#set-up-identity-providers). @@ -653,7 +653,7 @@ IdPs, contact your provider's support. 1. Complete the SAML general configuration. Enter: - `"Single sign-on URL"`: Use the assertion consumer service URL. - `"Audience URI"`: Use the issuer. - - [`NameID`](../user/group/saml_sso/index.md#nameid). + - [`NameID`](../user/group/saml_sso/index.md#manage-user-saml-identity). - [Assertions](#configure-assertions). 1. In the feedback section, enter that you're a customer and creating an app for internal use. @@ -2442,7 +2442,7 @@ The value given is added to the current time at which the response is validated. Before setting the `uid` to a unique attribute, make sure that you have configured the following attributes so your SAML users cannot change them: -- [`NameID`](../user/group/saml_sso/index.md#nameid). +- [`NameID`](../user/group/saml_sso/index.md#manage-user-saml-identity). - `Email` when used with `omniauth_auto_link_saml_user`. If users can change these attributes, they can sign in as other authorized users. @@ -3120,7 +3120,7 @@ such as the following: | Sign SAML assertion | Optional | Validates the integrity of a SAML assertion. When active, signs the whole response. | | Check SAML request signature | Optional | Checks the signature on the SAML response. | | Default RelayState | Optional | Specifies the URL users should end up on after successfully signing in through SAML at your IdP. | -| NameID format | Persistent | See [NameID format details](../user/group/saml_sso/index.md#nameid-format). | +| NameID format | Persistent | See [NameID format details](../user/group/saml_sso/index.md#manage-user-saml-identity). | | Additional URLs | Optional | May include the issuer, identifier, or assertion consumer service URL in other fields on some providers. | For example configurations, see the [notes on specific providers](#set-up-identity-providers). diff --git a/doc/operations/incident_management/slack.md b/doc/operations/incident_management/slack.md index a6f79320630..62f77ec9f06 100644 --- a/doc/operations/incident_management/slack.md +++ b/doc/operations/incident_management/slack.md @@ -7,7 +7,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w # Incident management for Slack (Beta) **(FREE SAAS)** > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/344856) in GitLab 15.7 [with a flag](../../administration/feature_flags.md) named `incident_declare_slash_command`. Disabled by default. -> - [Enabled on GitLab.com](https://gitlab.com/gitlab-org/gitlab/-/issues/378072) in GitLab 15.10 in [Open Beta](../../policy/alpha-beta-support.md#beta). +> - [Enabled on GitLab.com](https://gitlab.com/gitlab-org/gitlab/-/issues/378072) in GitLab 15.10 in [Beta](../../policy/alpha-beta-support.md#beta). FLAG: On self-managed GitLab, this feature is not available. diff --git a/doc/operations/metrics/dashboards/panel_types.md b/doc/operations/metrics/dashboards/panel_types.md index 6505b335a04..5d52691eed8 100644 --- a/doc/operations/metrics/dashboards/panel_types.md +++ b/doc/operations/metrics/dashboards/panel_types.md @@ -234,7 +234,7 @@ For example, if you have a query value of `53.6`, adding `%` as the unit results ## Gauge WARNING: -This panel type is an [Alpha](../../../policy/alpha-beta-support.md#experiment) feature, and is subject to change at any time +This panel type is an [Experiment](../../../policy/alpha-beta-support.md#experiment) and is subject to change at any time without prior notice! > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/207044) in GitLab 13.3. diff --git a/doc/operations/metrics/dashboards/templating_variables.md b/doc/operations/metrics/dashboards/templating_variables.md index a9be27b1d5c..7af4b9a9e43 100644 --- a/doc/operations/metrics/dashboards/templating_variables.md +++ b/doc/operations/metrics/dashboards/templating_variables.md @@ -27,7 +27,7 @@ described [in Using Variables](variables.md). ## `text` variable type WARNING: -This variable type is an [Alpha](../../../policy/alpha-beta-support.md#experiment) feature, and is subject to change at any time +This variable type is an [Experiment](../../../policy/alpha-beta-support.md#experiment), and is subject to change at any time without prior notice! For each `text` variable defined in the dashboard YAML, a free text field displays @@ -64,7 +64,7 @@ templating: ## `custom` variable type WARNING: -This variable type is an [Alpha](../../../policy/alpha-beta-support.md#experiment) feature, and is subject to change at any time +This variable type is an [Experiment](../../../policy/alpha-beta-support.md#experiment), and is subject to change at any time without prior notice! Each `custom` variable defined in the dashboard YAML creates a dropdown list @@ -112,7 +112,7 @@ templating: ## `metric_label_values` variable type WARNING: -This variable type is an [Alpha](../../../policy/alpha-beta-support.md#experiment) feature, and is subject to change at any time +This variable type is an [Experiment](../../../policy/alpha-beta-support.md#experiment), and is subject to change at any time without prior notice! ### Full syntax diff --git a/doc/user/application_security/coverage_fuzzing/index.md b/doc/user/application_security/coverage_fuzzing/index.md index 45607805916..09370a9a7f5 100644 --- a/doc/user/application_security/coverage_fuzzing/index.md +++ b/doc/user/application_security/coverage_fuzzing/index.md @@ -225,7 +225,7 @@ Prerequisites: ## Coverage-guided fuzz testing report -> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/220062) in GitLab 13.3 as an [Alpha feature](../../../policy/alpha-beta-support.md#experiment). +> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/220062) in GitLab 13.3 as an [Experiment](../../../policy/alpha-beta-support.md#experiment). For detailed information about the `gl-coverage-fuzzing-report.json` file's format, read the [schema](https://gitlab.com/gitlab-org/security-products/security-report-schemas/-/blob/master/dist/coverage-fuzzing-report-format.json). diff --git a/doc/user/clusters/agent/gitops/flux.md b/doc/user/clusters/agent/gitops/flux.md index 7b2c2f222ad..98840080716 100644 --- a/doc/user/clusters/agent/gitops/flux.md +++ b/doc/user/clusters/agent/gitops/flux.md @@ -15,7 +15,7 @@ You can use Flux to: To get started, see the [Flux installation documentation](https://fluxcd.io/flux/installation). -Support for Flux is in [Open Beta](../../../../policy/alpha-beta-support.md#beta). +Support for Flux is in [Beta](../../../../policy/alpha-beta-support.md#beta). ## Bootstrap installation diff --git a/doc/user/clusters/agent/gitops/helm.md b/doc/user/clusters/agent/gitops/helm.md index b79ac402c46..182fd87e6f9 100644 --- a/doc/user/clusters/agent/gitops/helm.md +++ b/doc/user/clusters/agent/gitops/helm.md @@ -4,7 +4,7 @@ group: Environments info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments --- -# Using Helm charts to update a Kubernetes cluster (Alpha) **(FREE)** +# Using Helm charts to update a Kubernetes cluster (Experiment) **(FREE)** > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/371019) in GitLab 15.4. > - Specifying a branch, tag, or commit reference to fetch the Kubernetes manifest files [introduced](https://gitlab.com/groups/gitlab-org/-/epics/4516) in GitLab 15.7. @@ -13,11 +13,11 @@ You can deploy Helm charts to your Kubernetes cluster and keep the resources in with your charts and values. To do this, you use the pull-based GitOps features of the agent for Kubernetes. -This feature is in Alpha and [an epic exists](https://gitlab.com/groups/gitlab-org/-/epics/7938) +This feature is an Experiment and [an epic exists](https://gitlab.com/groups/gitlab-org/-/epics/7938) to track future work. Tell us about your use cases by leaving comments in the epic. NOTE: -This feature is Alpha. In future releases, to accommodate new features, the configuration format might change without notice. +This feature is an Experiment. In future releases, to accommodate new features, the configuration format might change without notice. ## GitOps workflow steps diff --git a/doc/user/group/import/index.md b/doc/user/group/import/index.md index 33adb415d39..8e8299594f0 100644 --- a/doc/user/group/import/index.md +++ b/doc/user/group/import/index.md @@ -40,7 +40,7 @@ Migrating groups by direct transfer copies the groups from one place to another. - The subgroup of any existing top-level group. - Another GitLab instance, including GitLab.com. - In the [API](../../../api/bulk_imports.md), copy top-level groups and subgroups to these locations. -- Copy groups with projects (in [beta](../../../policy/alpha-beta-support.md#beta) and not ready for production +- Copy groups with projects (in [Beta](../../../policy/alpha-beta-support.md#beta) and not ready for production use) or without projects. Copying projects with groups is available: - On GitLab.com by default. @@ -50,7 +50,7 @@ Not all group and project resources are copied. See list of copied resources bel - [Migrated project items](#migrated-project-items-beta). WARNING: -Importing groups with projects is in [beta](../../../policy/alpha-beta-support.md#beta). This feature is not +Importing groups with projects is in [Beta](../../../policy/alpha-beta-support.md#beta). This feature is not ready for production use. We invite you to leave your feedback about migrating by direct transfer in @@ -153,7 +153,7 @@ role. 1. After a group has been imported, select its GitLab path to open its GitLab URL. WARNING: -Importing groups with projects is in [beta](../../../policy/alpha-beta-support.md#beta). This feature is not +Importing groups with projects is in [Beta](../../../policy/alpha-beta-support.md#beta). This feature is not ready for production use. ### Group import history @@ -247,7 +247,7 @@ specific project item is migrated: Any other project items are **not** migrated. WARNING: -Migrating projects when migrating groups by direct transfer is in [beta](../../../policy/alpha-beta-support.md#beta) +Migrating projects when migrating groups by direct transfer is in [Beta](../../../policy/alpha-beta-support.md#beta) and is not ready for production use. Project items that are migrated to the destination GitLab instance include: diff --git a/doc/user/group/manage.md b/doc/user/group/manage.md index ae239fc0154..57c070da268 100644 --- a/doc/user/group/manage.md +++ b/doc/user/group/manage.md @@ -658,7 +658,7 @@ Support for group-level settings for merge request approval rules is tracked in > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/405126) in GitLab 15.11. WARNING: -This feature is in [Open Beta](/ee/policy/alpha-beta-support.md#beta). Code Suggestions use generative AI to suggest code while you're developing. Due to high demand, this feature will have unscheduled downtime and code suggestions in VS Code may be delayed. Code Suggestions may produce [low-quality or incomplete suggestions](../project/repository/code_suggestions.md#model-accuracy-and-quality). Beta users should read about the [known limitations](../project/repository/code_suggestions.md#known-limitations). We look forward to hearing your feedback. +This feature is in [Beta](/ee/policy/alpha-beta-support.md#beta). Code Suggestions use generative AI to suggest code while you're developing. Due to high demand, this feature will have unscheduled downtime and code suggestions in VS Code may be delayed. Code Suggestions may produce [low-quality or incomplete suggestions](../project/repository/code_suggestions.md#model-accuracy-and-quality). Beta users should read about the [known limitations](../project/repository/code_suggestions.md#known-limitations). We look forward to hearing your feedback. This setting enables users in the group to access [Code Suggestions](../project/repository/code_suggestions.md). This setting [cascades to all projects](../project/merge_requests/approvals/settings.md#settings-cascading) diff --git a/doc/user/group/saml_sso/index.md b/doc/user/group/saml_sso/index.md index e5e83384e3a..a54b3fea53e 100644 --- a/doc/user/group/saml_sso/index.md +++ b/doc/user/group/saml_sso/index.md @@ -53,7 +53,7 @@ To set up SSO with Azure as your identity provider: 1. You should set the following attributes: - **Unique User Identifier (Name identifier)** to `user.objectID`. - - **nameid-format** to `persistent`. For more information, see [**NameID**](#nameid). + - **nameid-format** to `persistent`. For more information, see how to [manage user SAML identity](#manage-user-saml-identity). - **Additional claims** to [supported attributes](#user-attributes). 1. Make sure the identity provider is set to have provider-initiated calls @@ -96,8 +96,9 @@ To set up Google Workspace as your identity provider: - For **Primary email**: `email`. - For **First name**: `first_name`. - For **Last name**: `last_name`. - - For **Name ID format**: `EMAIL`. For more information, see the [**NameID** format documentation](#nameid-format). - - For **NameID**: `Basic Information > Primary email`. For more information, see [**NameID**](#nameid). + - For **Name ID format**: `EMAIL`. + - For **NameID**: `Basic Information > Primary email`. + For more information, see [manage user SAML identity](#manage-user-saml-identity). 1. Make sure the identity provider is set to have provider-initiated calls to link existing GitLab accounts. @@ -132,7 +133,7 @@ To set up SSO with Okta as your identity provider: 1. Set these values: - For **Application username (NameID)**: **Custom** `user.getInternalProperty("id")`. - - For **Name ID Format**: `Persistent`. For more information, see [**NameID**](#nameid). + - For **Name ID Format**: `Persistent`. For more information, see [manage user SAML identity](#manage-user-saml-identity). 1. Make sure the identity provider is set to have provider-initiated calls to link existing GitLab accounts. @@ -168,7 +169,7 @@ To set up OneLogin as your identity provider: | **GitLab single sign-on URL** | **Login URL** | | **Identity provider single sign-on URL** | **SAML 2.0 Endpoint** | -1. For **NameID**, use `OneLogin ID`. For more information, see [**NameID**](#nameid). +1. For **NameID**, use `OneLogin ID`. For more information, see [manage user SAML identity](#manage-user-saml-identity). 1. Make sure the identity provider is set to have provider-initiated calls to link existing GitLab accounts. @@ -201,7 +202,7 @@ users cannot access any of the SAML groups. To mitigate this, you can disable To change identity providers: 1. [Configure](#set-up-your-identity-provider) the group with the new identity provider. -1. Optional. If the **NameID** is not identical, [change the **NameID** for users](#change-nameid-for-one-or-more-users). +1. Optional. If the **NameID** is not identical, [change the **NameID** for users](#manage-user-saml-identity). #### Change email domains @@ -210,7 +211,7 @@ To migrate users to a new email domain, tell users to: 1. Add their new email as the primary email to their accounts and verify it. 1. Optional. Remove their old email from the account. -If the **NameID** is configured with the email address, [change the **NameID** for users](#change-nameid-for-one-or-more-users). +If the **NameID** is configured with the email address, [change the **NameID** for users](#manage-user-saml-identity). ## Configure GitLab @@ -295,11 +296,36 @@ are then redirected to sign in through the identity provider. 1. From the list of apps, select the "GitLab.com" app. (The name is set by the administrator of the identity provider.) 1. You are then signed in to GitLab.com and redirected to the group. -### Change **NameID** for one or more users +### Manage user SAML identity > Update of SAML identities using the SAML API [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/227841) in GitLab 15.5. -Group owners can update the SAML identities for their group members using the [SAML API](../../../api/saml.md#update-extern_uid-field-for-a-saml-identity). +GitLab.com uses the SAML **NameID** to identify users. The **NameID** is: + +- A required field in the SAML response. +- Case sensitive. + +The **NameID** must: + +- Be unique to each user. +- Be a persistent value that never changes, such as a randomly generated unique user ID. +- Match exactly on subsequent sign-in attempts, so it should not rely on user input + that could change between upper and lower case. + +The **NameID** should not be an email address or username because: + +- Email addresses and usernames are more likely to change over time. For example, + when a person's name changes. +- Email addresses are case-insensitive, which can result in users being unable to + sign in. + +The **NameID** format must be `Persistent`, unless you are using a field, like email, that +requires a different format. You can use any format except `Transient`. + +#### Change user **NameID** + +Group owners can use the [SAML API](../../../api/saml.md#update-extern_uid-field-for-a-saml-identity) to change their group members' **NameID** and update their SAML identities . + If [SCIM](scim_setup.md) is configured, group owners can update the SCIM identities using the [SCIM API](../../../api/scim.md#update-extern_uid-field-for-a-scim-identity). Alternatively, ask the users to reconnect their SAML account. @@ -307,6 +333,13 @@ Alternatively, ask the users to reconnect their SAML account. 1. Ask relevant users to [unlink their account from the group](#unlink-accounts). 1. Ask relevant users to [link their account to the new SAML app](#link-saml-to-your-existing-gitlabcom-account). +WARNING: +After users have signed into GitLab using SSO SAML, changing the **NameID** value +breaks the configuration and could lock users out of the GitLab group. + +For more information on the recommended value and format for specific identity +providers, see [set up your identity provider](#set-up-your-identity-provider). + ### Configure user settings from SAML response > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/263661) in GitLab 13.7. @@ -404,41 +437,6 @@ For example, to unlink the `MyOrg` account: 1. On the left sidebar, select **Account**. 1. In the **Service sign-in** section, select **Disconnect** next to the connected account. -## NameID - -GitLab.com uses the SAML **NameID** to identify users. The **NameID** is: - -- A required field in the SAML response. -- Case sensitive. - -The **NameID** must: - -- Be unique to each user. -- Be a persistent value that never changes, such as a randomly generated unique user ID. -- Match exactly on subsequent sign-in attempts, so it should not rely on user input - that could change between upper and lower case. - -The **NameID** should not be an email address or username because: - -- Email addresses and usernames are more likely to change over time. For example, - when a person's name changes. -- Email addresses are case-insensitive, which can result in users being unable to - sign in. - -For more information on the recommended value and format for specific identity -providers, see [set up your identity provider](#set-up-your-identity-provider). - -WARNING: -After users have signed into GitLab using SSO SAML, changing the **NameID** value -breaks the configuration and could lock users out of the GitLab group. - -### **NameID** format - -Set the **NameID** format to `Persistent`, unless you are using a field, like email, that -requires a different format. - -You can use any format except `Transient`. - ## SSO enforcement > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/5291) in GitLab 11.8. diff --git a/doc/user/okrs.md b/doc/user/okrs.md index 3de521abc8a..a61c395ab00 100644 --- a/doc/user/okrs.md +++ b/doc/user/okrs.md @@ -8,8 +8,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/103355) in GitLab 15.6 [with a flag](../administration/feature_flags.md) named `okrs_mvc`. Disabled by default. -WARNING: -OKRs are in [**Alpha**](../policy/alpha-beta-support.md#experiment). +OKRs are an [Experiment](../policy/alpha-beta-support.md#experiment). For the OKR feature roadmap, see [epic 7864](https://gitlab.com/groups/gitlab-org/-/epics/7864). FLAG: diff --git a/doc/user/packages/package_registry/supported_package_managers.md b/doc/user/packages/package_registry/supported_package_managers.md index 75b8c95a0fa..0c33bef5e1c 100644 --- a/doc/user/packages/package_registry/supported_package_managers.md +++ b/doc/user/packages/package_registry/supported_package_managers.md @@ -11,24 +11,20 @@ Not all package manager formats are ready for production use. The Package Registry supports the following package manager types: -| Package type | GitLab version | Status | -| ------------------------------------------------ | -------------- | ---------------------------------------------------------- | -| [Maven](../maven_repository/index.md) | 11.3+ | GA | -| [npm](../npm_registry/index.md) | 11.7+ | GA | -| [NuGet](../nuget_repository/index.md) | 12.8+ | GA | -| [PyPI](../pypi_repository/index.md) | 12.10+ | GA | -| [Generic packages](../generic_packages/index.md) | 13.5+ | GA | -| [Composer](../composer_repository/index.md) | 13.2+ | [Beta](https://gitlab.com/groups/gitlab-org/-/epics/6817) | -| [Conan](../conan_repository/index.md) | 12.6+ | [Beta](https://gitlab.com/groups/gitlab-org/-/epics/6816) | -| [Helm](../helm_repository/index.md) | 14.1+ | [Beta](https://gitlab.com/groups/gitlab-org/-/epics/6366) | -| [Debian](../debian_repository/index.md) | 14.2+ | [Alpha](https://gitlab.com/groups/gitlab-org/-/epics/6057) | -| [Go](../go_proxy/index.md) | 13.1+ | [Alpha](https://gitlab.com/groups/gitlab-org/-/epics/3043) | -| [Ruby gems](../rubygems_registry/index.md) | 13.10+ | [Alpha](https://gitlab.com/groups/gitlab-org/-/epics/3200) | +| Package type | GitLab version | Status | +| ------------------------------------------------ | -------------- | --------------------------------------------------------------- | +| [Maven](../maven_repository/index.md) | 11.3+ | GA | +| [npm](../npm_registry/index.md) | 11.7+ | GA | +| [NuGet](../nuget_repository/index.md) | 12.8+ | GA | +| [PyPI](../pypi_repository/index.md) | 12.10+ | GA | +| [Generic packages](../generic_packages/index.md) | 13.5+ | GA | +| [Composer](../composer_repository/index.md) | 13.2+ | [Beta](https://gitlab.com/groups/gitlab-org/-/epics/6817) | +| [Conan](../conan_repository/index.md) | 12.6+ | [Beta](https://gitlab.com/groups/gitlab-org/-/epics/6816) | +| [Helm](../helm_repository/index.md) | 14.1+ | [Beta](https://gitlab.com/groups/gitlab-org/-/epics/6366) | +| [Debian](../debian_repository/index.md) | 14.2+ | [Experiment](https://gitlab.com/groups/gitlab-org/-/epics/6057) | +| [Go](../go_proxy/index.md) | 13.1+ | [Experiment](https://gitlab.com/groups/gitlab-org/-/epics/3043) | +| [Ruby gems](../rubygems_registry/index.md) | 13.10+ | [Experiment](https://gitlab.com/groups/gitlab-org/-/epics/3200) | -[Status](../../../policy/alpha-beta-support.md): - -- Alpha: behind a feature flag and not officially supported. -- Beta: several known issues that may prevent expected use. -- GA (Generally Available): ready for production use at any scale. +[View what each status means](../../../policy/alpha-beta-support.md). You can also use the [API](../../../api/packages.md) to administer the Package Registry. diff --git a/doc/user/product_analytics/index.md b/doc/user/product_analytics/index.md index bd1900f70e3..5c8e7712c6c 100644 --- a/doc/user/product_analytics/index.md +++ b/doc/user/product_analytics/index.md @@ -4,9 +4,9 @@ group: Product Analytics info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments --- -# Product analytics (Alpha) **(ULTIMATE)** +# Product analytics (Experiment) **(ULTIMATE)** -> - Introduced in GitLab 15.4 as an [Alpha](../../policy/alpha-beta-support.md#experiment) feature [with a flag](../../administration/feature_flags.md) named `cube_api_proxy`. Disabled by default. +> - Introduced in GitLab 15.4 as an [Experiment](../../policy/alpha-beta-support.md#experiment) feature [with a flag](../../administration/feature_flags.md) named `cube_api_proxy`. Disabled by default. > - `cube_api_proxy` revised to only reference the [Product Analytics API](../../api/product_analytics.md) in GitLab 15.6. > - `cube_api_proxy` removed and replaced with `product_analytics_internal_preview` in GitLab 15.10. > - `product_analytics_internal_preview` replaced with `product_analytics_dashboards` in GitLab 15.11. @@ -226,13 +226,13 @@ You can export the raw data for a specific dimension by passing a list of dimens POST /api/v4/projects/PROJECT_ID/product_analytics/request/load?queryType=multi { + "query":{ "dimensions": [ "TrackedEvents.docEncoding", "TrackedEvents.docHost", "TrackedEvents.docPath", "TrackedEvents.docSearch", "TrackedEvents.eventType", - "TrackedEvents.idsAjsAnonymousId", "TrackedEvents.localTzOffset", "TrackedEvents.pageTitle", "TrackedEvents.src", @@ -242,6 +242,7 @@ POST /api/v4/projects/PROJECT_ID/product_analytics/request/load?queryType=multi "order": { "TrackedEvents.apiKey": "asc" } + } } ``` diff --git a/doc/user/profile/achievements.md b/doc/user/profile/achievements.md index 06815521368..c8456a80e69 100644 --- a/doc/user/profile/achievements.md +++ b/doc/user/profile/achievements.md @@ -4,7 +4,7 @@ group: Tenant Scale info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments --- -# Achievements (Alpha) **(FREE)** +# Achievements (Experiment) **(FREE)** > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/113156) in GitLab 15.10 [with a flag](../../administration/feature_flags.md) named `achievements`. Disabled by default. @@ -21,7 +21,7 @@ An achievement consists of a name, a description, and an avatar.  -This feature is in Alpha. +This feature is an Experiment. For more information about planned work, see [epic 9429](https://gitlab.com/groups/gitlab-org/-/epics/9429). Tell us about your use cases by leaving comments in the epic. diff --git a/doc/user/profile/preferences.md b/doc/user/profile/preferences.md index bb8b6cbea4e..696a5f4b42e 100644 --- a/doc/user/profile/preferences.md +++ b/doc/user/profile/preferences.md @@ -39,11 +39,11 @@ The default theme is Indigo. You can choose between 10 themes: ## Dark mode -> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/28252) in GitLab 13.1 as an [Alpha](../../policy/alpha-beta-support.md#experiment) release. +> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/28252) in GitLab 13.1 as an [Experiment](../../policy/alpha-beta-support.md#experiment) release. -GitLab has started work on dark mode! The dark mode Alpha release is available in the +GitLab has started work on dark mode! The dark mode Experiment release is available in the spirit of iteration and the lower expectations of -[Alpha versions](../../policy/alpha-beta-support.md#experiment). +[Experiment features](../../policy/alpha-beta-support.md#experiment). Progress on dark mode is tracked in the [Dark theme epic](https://gitlab.com/groups/gitlab-org/-/epics/2902). See the epic for: diff --git a/doc/user/project/import/phabricator.md b/doc/user/project/import/phabricator.md index e7568d87dbe..d8784db5e29 100644 --- a/doc/user/project/import/phabricator.md +++ b/doc/user/project/import/phabricator.md @@ -15,7 +15,7 @@ and will be removed in GitLab 16.0. WARNING: The Phabricator task importer is in -[beta](../../../policy/alpha-beta-support.md#beta) and is +[Beta](../../../policy/alpha-beta-support.md#beta) and is [**not** complete](https://gitlab.com/gitlab-org/gitlab/-/issues/284406). It imports only an issue's title and description. The GitLab project created during the import process contains only issues, and the associated repository is disabled. diff --git a/doc/user/project/integrations/mlflow_client.md b/doc/user/project/integrations/mlflow_client.md index 6e03a7a1eed..734573d4756 100644 --- a/doc/user/project/integrations/mlflow_client.md +++ b/doc/user/project/integrations/mlflow_client.md @@ -6,7 +6,7 @@ info: Machine Learning Experiment Tracking is a GitLab Incubation Engineering pr # MLFlow Client Integration **(FREE)** -> [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/8560) in GitLab 15.6 as an [Alpha](../../../policy/alpha-beta-support.md#experiment) release [with a flag](../../../administration/feature_flags.md) named `ml_experiment_tracking`. Disabled by default. +> [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/8560) in GitLab 15.6 as an [Experiment](../../../policy/alpha-beta-support.md#experiment) release [with a flag](../../../administration/feature_flags.md) named `ml_experiment_tracking`. Disabled by default. DISCLAIMER: MLFlow Client Integration is an experimental feature being developed by the Incubation Engineering Department, diff --git a/doc/user/project/merge_requests/reviews/index.md b/doc/user/project/merge_requests/reviews/index.md index 974cab837a0..22e95c7e639 100644 --- a/doc/user/project/merge_requests/reviews/index.md +++ b/doc/user/project/merge_requests/reviews/index.md @@ -23,7 +23,7 @@ review merge requests in Visual Studio Code. ## Suggested reviewers **(ULTIMATE SAAS)** -> - [Introduced](https://gitlab.com/groups/gitlab-org/modelops/applied-ml/review-recommender/-/epics/3) in GitLab 15.4 as an [Open Beta](../../../../policy/alpha-beta-support.md#beta) feature [with a flag](../../../../administration/feature_flags.md) named `suggested_reviewers_control`. Disabled by default. +> - [Introduced](https://gitlab.com/groups/gitlab-org/modelops/applied-ml/review-recommender/-/epics/3) in GitLab 15.4 as a [Beta](../../../../policy/alpha-beta-support.md#beta) feature [with a flag](../../../../administration/feature_flags.md) named `suggested_reviewers_control`. Disabled by default. > - [Enabled on GitLab.com](https://gitlab.com/gitlab-org/gitlab/-/issues/368356) in GitLab 15.6. > - Beta designation [removed from the UI](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/113058) in GitLab 15.10. diff --git a/doc/user/project/merge_requests/reviews/suggestions.md b/doc/user/project/merge_requests/reviews/suggestions.md index 526ccfdd315..9187c5fad44 100644 --- a/doc/user/project/merge_requests/reviews/suggestions.md +++ b/doc/user/project/merge_requests/reviews/suggestions.md @@ -155,7 +155,7 @@ For example, to customize the commit message to output ## Batch suggestions -> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/25486) in GitLab 13.1 as an [alpha feature](../../../../policy/alpha-beta-support.md#experiment) with a flag named `batch_suggestions`, disabled by default. +> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/25486) in GitLab 13.1 as an [Experiment](../../../../policy/alpha-beta-support.md#experiment) with a flag named `batch_suggestions`, disabled by default. > - [Enabled by default](https://gitlab.com/gitlab-org/gitlab/-/issues/227799) in GitLab 13.2. > - [Generally available](https://gitlab.com/gitlab-org/gitlab/-/issues/320755) in GitLab 13.11. [Feature flag `batch_suggestions`](https://gitlab.com/gitlab-org/gitlab/-/issues/320755) removed. > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/326168) custom commit messages for batch suggestions in GitLab 14.4. diff --git a/doc/user/project/remote_development/index.md b/doc/user/project/remote_development/index.md index 4e9e2c19a81..857be8361d4 100644 --- a/doc/user/project/remote_development/index.md +++ b/doc/user/project/remote_development/index.md @@ -14,7 +14,7 @@ FLAG: On self-managed GitLab, by default this feature is available. To hide the feature, ask an administrator to [disable the feature flag](../../../administration/feature_flags.md) named `vscode_web_ide`. On GitLab.com, this feature is available. The feature is not ready for production use. WARNING: -This feature is in [Alpha](../../../policy/alpha-beta-support.md#experiment) and subject to change without notice. +This feature is an [Experiment](../../../policy/alpha-beta-support.md#experiment) and subject to change without notice. DISCLAIMER: This page contains information related to upcoming products, features, and functionality. diff --git a/doc/user/project/repository/code_suggestions.md b/doc/user/project/repository/code_suggestions.md index 50993e1ec55..68b1551eb16 100644 --- a/doc/user/project/repository/code_suggestions.md +++ b/doc/user/project/repository/code_suggestions.md @@ -5,13 +5,13 @@ info: To determine the technical writer assigned to the Stage/Group associated w type: index, reference --- -# Code Suggestions (Open Beta) **(ULTIMATE SAAS)** +# Code Suggestions (Beta) **(ULTIMATE SAAS)** -> - Enabled as opt-in with GitLab 15.11 as [Open Beta](/ee/policy/alpha-beta-support.md#beta). -> - [Introduced](https://about.gitlab.com/releases/2023/02/22/gitlab-15-9-released/#code-suggestions-available-in-closed-beta) in GitLab 15.9 as [Closed Beta](/ee/policy/alpha-beta-support.md#beta). +> - Enabled as opt-in with GitLab 15.11 as [Beta](/ee/policy/alpha-beta-support.md#beta). +> - [Introduced](https://about.gitlab.com/releases/2023/02/22/gitlab-15-9-released/#code-suggestions-available-in-closed-beta) in GitLab 15.9 as [Beta](/ee/policy/alpha-beta-support.md#beta) for early access Ultimate customers. WARNING: -This feature is in [Open Beta](/ee/policy/alpha-beta-support.md#beta). Code Suggestions use generative AI to suggest code while you're developing. Due to high demand, this feature will have unscheduled downtime and code suggestions in VS Code may be delayed. Code Suggestions may produce [low-quality or incomplete suggestions](#model-accuracy-and-quality). Beta users should read about the [known limitations](#known-limitations). We look forward to hearing your feedback. +This feature is in [Beta](/ee/policy/alpha-beta-support.md#beta). Code Suggestions use generative AI to suggest code while you're developing. Due to high demand, this feature will have unscheduled downtime and code suggestions in VS Code may be delayed. Code Suggestions may produce [low-quality or incomplete suggestions](#model-accuracy-and-quality). Beta users should read about the [known limitations](#known-limitations). We look forward to hearing your feedback. Use Code Suggestions to write code more efficiently by viewing code suggestions as you type. Depending on the cursor position, the extension either: @@ -98,7 +98,7 @@ Code Suggestions only work when you have internet connectivity and can access Gi ### Stability and performance -This feature is currently in [Open Beta](/ee/policy/alpha-beta-support.md#beta). While the Code Suggestions inference API operates completely within GitLab.com's enterprise infrastructure, we expect a high demand for this Beta feature, which may cause degraded performance or unexpected downtime of the feature. We have built this feature to gracefully degrade and have controls in place to allow us to mitigate abuse or misuse. GitLab may disable this feature for any or all customers at any time at our discretion. +This feature is currently in [Beta](/ee/policy/alpha-beta-support.md#beta). While the Code Suggestions inference API operates completely within GitLab.com's enterprise infrastructure, we expect a high demand for this Beta feature, which may cause degraded performance or unexpected downtime of the feature. We have built this feature to gracefully degrade and have controls in place to allow us to mitigate abuse or misuse. GitLab may disable this feature for any or all customers at any time at our discretion. ## Data privacy diff --git a/doc/user/project/repository/jupyter_notebooks/index.md b/doc/user/project/repository/jupyter_notebooks/index.md index 9b24edb411e..1526c7b4dc2 100644 --- a/doc/user/project/repository/jupyter_notebooks/index.md +++ b/doc/user/project/repository/jupyter_notebooks/index.md @@ -25,7 +25,7 @@ GitLab. ## Cleaner diffs and raw diffs -> - [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/6589) in GitLab 14.5 as an [Alpha](../../../../policy/alpha-beta-support.md#experiment) release [with a flag](../../../../administration/feature_flags.md) named `jupyter_clean_diffs`. Enabled by default. +> - [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/6589) in GitLab 14.5 as an [Experiment](../../../../policy/alpha-beta-support.md#experiment) release [with a flag](../../../../administration/feature_flags.md) named `jupyter_clean_diffs`. Enabled by default. > - [Generally available](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75500) in GitLab 14.9. Feature flag `jupyter_clean_diffs` removed. > - [Reintroduced toggle](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/85079) in GitLab 15.0 [with a flag](../../../../administration/feature_flags.md) named `ipynb_semantic_diff`. Enabled by default. > - [Generally available](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/95373) in GitLab 15.6. Feature flag `ipynb_semantic_diff` removed. diff --git a/doc/user/project/web_ide/index.md b/doc/user/project/web_ide/index.md index df5290144c5..678c329e16e 100644 --- a/doc/user/project/web_ide/index.md +++ b/doc/user/project/web_ide/index.md @@ -296,7 +296,7 @@ An example `package.json`: > [Moved](https://gitlab.com/gitlab-org/gitlab/-/issues/211685) from GitLab Ultimate to GitLab Free in 13.1. WARNING: -Interactive Web Terminals for the Web IDE is currently in [**Beta**](../../../policy/alpha-beta-support.md#beta). +Interactive Web Terminals for the Web IDE is currently in [Beta](../../../policy/alpha-beta-support.md#beta). GitLab.com shared runners [do not yet support Interactive Web Terminals](https://gitlab.com/gitlab-org/gitlab/-/issues/24674), so you must use your own private runner to make use of this feature. diff --git a/lib/api/ci/pipelines.rb b/lib/api/ci/pipelines.rb index c683fdf7aad..2ea0b5f1cdb 100644 --- a/lib/api/ci/pipelines.rb +++ b/lib/api/ci/pipelines.rb @@ -69,13 +69,19 @@ module API documentation: { example: 'asc' } optional :source, type: String, values: ::Ci::Pipeline.sources.keys, documentation: { example: 'push' } + optional :name, types: String, desc: 'Filter pipelines by name', + documentation: { example: 'Build pipeline' } end get ':id/pipelines', urgency: :low, feature_category: :continuous_integration do authorize! :read_pipeline, user_project authorize! :read_build, user_project + params.delete(:name) unless ::Feature.enabled?(:pipeline_name_in_api, user_project) + pipelines = ::Ci::PipelinesFinder.new(user_project, current_user, params).execute - present paginate(pipelines), with: Entities::Ci::PipelineBasic, project: user_project + pipelines = pipelines.preload_pipeline_metadata if ::Feature.enabled?(:pipeline_name_in_api, user_project) + + present paginate(pipelines), with: Entities::Ci::PipelineBasicWithMetadata, project: user_project end desc 'Create a new pipeline' do diff --git a/lib/api/entities/ci/pipeline_basic_with_metadata.rb b/lib/api/entities/ci/pipeline_basic_with_metadata.rb new file mode 100644 index 00000000000..4eeba3aec41 --- /dev/null +++ b/lib/api/entities/ci/pipeline_basic_with_metadata.rb @@ -0,0 +1,13 @@ +# frozen_string_literal: true + +module API + module Entities + module Ci + class PipelineBasicWithMetadata < PipelineBasic + expose :name, + documentation: { type: 'string', example: 'Build pipeline' }, + if: ->(pipeline, _) { ::Feature.enabled?(:pipeline_name_in_api, pipeline.project) } + end + end + end +end diff --git a/lib/gitlab/ci/templates/Jobs/Container-Scanning.gitlab-ci.yml b/lib/gitlab/ci/templates/Jobs/Container-Scanning.gitlab-ci.yml index 0cb3f85ba40..8063f3d1e69 100644 --- a/lib/gitlab/ci/templates/Jobs/Container-Scanning.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Jobs/Container-Scanning.gitlab-ci.yml @@ -40,7 +40,6 @@ container_scanning: reports: container_scanning: gl-container-scanning-report.json dependency_scanning: gl-dependency-scanning-report.json - cyclonedx: "**/gl-sbom-*.cdx.json" paths: [gl-container-scanning-report.json, gl-dependency-scanning-report.json, "**/gl-sbom-*.cdx.json"] dependencies: [] script: diff --git a/lib/gitlab/ci/templates/Jobs/Container-Scanning.latest.gitlab-ci.yml b/lib/gitlab/ci/templates/Jobs/Container-Scanning.latest.gitlab-ci.yml index e909037c081..24c23ce89f3 100644 --- a/lib/gitlab/ci/templates/Jobs/Container-Scanning.latest.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Jobs/Container-Scanning.latest.gitlab-ci.yml @@ -40,7 +40,6 @@ container_scanning: reports: container_scanning: gl-container-scanning-report.json dependency_scanning: gl-dependency-scanning-report.json - cyclonedx: "**/gl-sbom-*.cdx.json" paths: [gl-container-scanning-report.json, gl-dependency-scanning-report.json, "**/gl-sbom-*.cdx.json"] dependencies: [] script: diff --git a/lib/gitlab/favicon.rb b/lib/gitlab/favicon.rb index 8e48b482462..f4633473a95 100644 --- a/lib/gitlab/favicon.rb +++ b/lib/gitlab/favicon.rb @@ -24,7 +24,7 @@ module Gitlab 'favicon-blue.png' end - def status_overlay(status_name) + def ci_status_overlay(status_name) path = File.join( 'ci_favicons', "#{status_name}.png" @@ -33,6 +33,15 @@ module Gitlab ActionController::Base.helpers.image_path(path, host: host) end + def mr_status_overlay(status_name) + path = File.join( + 'mr_favicons', + "#{status_name}.png" + ) + + ActionController::Base.helpers.image_path(path, host: host) + end + def available_status_names @available_status_names ||= Dir.glob(Rails.root.join('app', 'assets', 'images', 'ci_favicons', '*.png')) .map { |file| File.basename(file, '.png') } diff --git a/locale/gitlab.pot b/locale/gitlab.pot index ad22dbe5268..935fbe0700f 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -715,6 +715,9 @@ msgstr "" msgid "%{firstMilestoneName} + %{numberOfOtherMilestones} more" msgstr "" +msgid "%{fork_icon} %{source_project_path}:%{source_branch}" +msgstr "" + msgid "%{gitlab_experience_text}. Don't worry, this information isn't shared outside of your self-managed GitLab instance." msgstr "" @@ -1075,6 +1078,9 @@ msgstr "" msgid "%{sourceBranch} into %{targetBranch}" msgstr "" +msgid "%{source_project_path}:%{source_branch}" +msgstr "" + msgid "%{source} %{copyButton} into %{target}" msgstr "" @@ -22223,6 +22229,9 @@ msgstr "" msgid "Import|GitHub import details" msgstr "" +msgid "Import|No import details" +msgstr "" + msgid "Import|Partially completed" msgstr "" @@ -44341,6 +44350,9 @@ msgstr "" msgid "The snippet is visible to any logged in user except external users." msgstr "" +msgid "The source project is a fork" +msgstr "" + msgid "The source project of this merge request has been removed." msgstr "" diff --git a/spec/factories/notes.rb b/spec/factories/notes.rb index 2a21bde5436..c58e7bb2e79 100644 --- a/spec/factories/notes.rb +++ b/spec/factories/notes.rb @@ -196,6 +196,10 @@ FactoryBot.define do confidential { true } end + trait :internal do + internal { true } + end + trait :with_review do review end diff --git a/spec/frontend/import/details/components/import_details_table_spec.js b/spec/frontend/import/details/components/import_details_table_spec.js new file mode 100644 index 00000000000..43c9a66c00a --- /dev/null +++ b/spec/frontend/import/details/components/import_details_table_spec.js @@ -0,0 +1,33 @@ +import { mount, shallowMount } from '@vue/test-utils'; +import { GlEmptyState, GlTable } from '@gitlab/ui'; + +import PaginationBar from '~/vue_shared/components/pagination_bar/pagination_bar.vue'; +import ImportDetailsTable from '~/import/details/components/import_details_table.vue'; + +describe('Import details table', () => { + let wrapper; + + const createComponent = ({ mountFn = shallowMount } = {}) => { + wrapper = mountFn(ImportDetailsTable); + }; + + const findGlTable = () => wrapper.findComponent(GlTable); + const findGlEmptyState = () => findGlTable().findComponent(GlEmptyState); + const findPaginationBar = () => wrapper.findComponent(PaginationBar); + + describe('template', () => { + describe('when no items are available', () => { + it('renders table with empty state', () => { + createComponent({ mountFn: mount }); + + expect(findGlEmptyState().exists()).toBe(true); + }); + + it('does not render pagination', () => { + createComponent(); + + expect(findPaginationBar().exists()).toBe(false); + }); + }); + }); +}); diff --git a/spec/frontend/jira_connect/branches/components/source_branch_dropdown_spec.js b/spec/frontend/jira_connect/branches/components/source_branch_dropdown_spec.js index 701512953df..a3bc8e861b2 100644 --- a/spec/frontend/jira_connect/branches/components/source_branch_dropdown_spec.js +++ b/spec/frontend/jira_connect/branches/components/source_branch_dropdown_spec.js @@ -147,7 +147,7 @@ describe('SourceBranchDropdown', () => { }); describe('when selecting a listbox item', () => { - it('emits `change` event with the selected branch name', async () => { + it('emits `change` event with the selected branch name', () => { const mockBranchName = mockProject.repository.branchNames[1]; findListbox().vm.$emit('select', mockBranchName); expect(wrapper.emitted('change')[1]).toEqual([mockBranchName]); @@ -157,7 +157,7 @@ describe('SourceBranchDropdown', () => { describe('when `selectedBranchName` prop is specified', () => { const mockBranchName = mockProject.repository.branchNames[2]; - beforeEach(async () => { + beforeEach(() => { wrapper.setProps({ selectedBranchName: mockBranchName, }); diff --git a/spec/frontend/jira_import/components/jira_import_form_spec.js b/spec/frontend/jira_import/components/jira_import_form_spec.js index c7db9f429de..7fd6398aaa4 100644 --- a/spec/frontend/jira_import/components/jira_import_form_spec.js +++ b/spec/frontend/jira_import/components/jira_import_form_spec.js @@ -304,7 +304,7 @@ describe('JiraImportForm', () => { expect(getContinueButton().text()).toBe('Continue'); }); - it('is in loading state when the form is submitting', async () => { + it('is in loading state when the form is submitting', () => { wrapper = mountComponent({ isSubmitting: true }); expect(getContinueButton().props('loading')).toBe(true); @@ -416,7 +416,7 @@ describe('JiraImportForm', () => { wrapper = mountComponent({ hasMoreUsers: true }); }); - it('calls the GraphQL user mapping mutation', async () => { + it('calls the GraphQL user mapping mutation', () => { const mutationArguments = { mutation: getJiraUserMappingMutation, variables: { diff --git a/spec/frontend/jobs/components/job/manual_variables_form_spec.js b/spec/frontend/jobs/components/job/manual_variables_form_spec.js index 98b9ca78a45..c8c865dd28e 100644 --- a/spec/frontend/jobs/components/job/manual_variables_form_spec.js +++ b/spec/frontend/jobs/components/job/manual_variables_form_spec.js @@ -54,7 +54,7 @@ describe('Manual Variables Form', () => { }); }; - const createComponentWithApollo = async ({ props = {} } = {}) => { + const createComponentWithApollo = ({ props = {} } = {}) => { const requestHandlers = [[getJobQuery, getJobQueryResponse]]; mockApollo = createMockApollo(requestHandlers); @@ -309,7 +309,7 @@ describe('Manual Variables Form', () => { await createComponentWithApollo(); }); - it('delete variable button placeholder should only exist when a user cannot remove', async () => { + it('delete variable button placeholder should only exist when a user cannot remove', () => { expect(findDeleteVarBtnPlaceholder().exists()).toBe(true); }); diff --git a/spec/frontend/jobs/components/job/sidebar_header_spec.js b/spec/frontend/jobs/components/job/sidebar_header_spec.js index da97945f9bf..cf182330578 100644 --- a/spec/frontend/jobs/components/job/sidebar_header_spec.js +++ b/spec/frontend/jobs/components/job/sidebar_header_spec.js @@ -31,7 +31,7 @@ describe('Sidebar Header', () => { }); }; - const createComponentWithApollo = async ({ props = {}, restJob = {} } = {}) => { + const createComponentWithApollo = ({ props = {}, restJob = {} } = {}) => { const getJobQueryResponse = jest.fn().mockResolvedValue(mockJobResponse); const requestHandlers = [[getJobQuery, getJobQueryResponse]]; diff --git a/spec/frontend/jobs/components/job/sidebar_spec.js b/spec/frontend/jobs/components/job/sidebar_spec.js index cefa4582c15..fbff64b4d78 100644 --- a/spec/frontend/jobs/components/job/sidebar_spec.js +++ b/spec/frontend/jobs/components/job/sidebar_spec.js @@ -139,7 +139,7 @@ describe('Sidebar details block', () => { return store.dispatch('receiveJobsForStageSuccess', jobsInStage.latest_statuses); }); - it('renders list of jobs', async () => { + it('renders list of jobs', () => { expect(findJobsContainer().exists()).toBe(true); }); }); @@ -147,7 +147,7 @@ describe('Sidebar details block', () => { describe('when job data changes', () => { const stageArg = job.pipeline.details.stages.find((stage) => stage.name === job.stage); - beforeEach(async () => { + beforeEach(() => { jest.spyOn(store, 'dispatch'); }); diff --git a/spec/frontend/jobs/components/table/cells/actions_cell_spec.js b/spec/frontend/jobs/components/table/cells/actions_cell_spec.js index 55fe534aa3b..79bc765f181 100644 --- a/spec/frontend/jobs/components/table/cells/actions_cell_spec.js +++ b/spec/frontend/jobs/components/table/cells/actions_cell_spec.js @@ -122,7 +122,7 @@ describe('Job actions cell', () => { ${findPlayButton} | ${'play'} | ${playableJob} | ${JobPlayMutation} | ${playMutationHandler} | ${playableJob.id} ${findRetryButton} | ${'retry'} | ${retryableJob} | ${JobRetryMutation} | ${retryMutationHandler} | ${retryableJob.id} ${findCancelButton} | ${'cancel'} | ${cancelableJob} | ${JobCancelMutation} | ${cancelMutationHandler} | ${cancelableJob.id} - `('performs the $action mutation', async ({ button, jobType, mutationFile, handler, jobId }) => { + `('performs the $action mutation', ({ button, jobType, mutationFile, handler, jobId }) => { createComponent(jobType, [[mutationFile, handler]]); button().vm.$emit('click'); diff --git a/spec/frontend/lib/apollo/persist_link_spec.js b/spec/frontend/lib/apollo/persist_link_spec.js index ddb861bcee0..f3afc4ba8cd 100644 --- a/spec/frontend/lib/apollo/persist_link_spec.js +++ b/spec/frontend/lib/apollo/persist_link_spec.js @@ -56,7 +56,7 @@ describe('~/lib/apollo/persist_link', () => { expect(childFields.some((field) => field.name.value === '__persist')).toBe(false); }); - it('decorates the response with `__persist: true` is there is `__persist` field in the query', async () => { + it('decorates the response with `__persist: true` is there is `__persist` field in the query', () => { const link = getPersistLink().concat(terminatingLink); subscription = execute(link, { query: QUERY_WITH_PERSIST_FIELD }).subscribe(({ data }) => { @@ -64,7 +64,7 @@ describe('~/lib/apollo/persist_link', () => { }); }); - it('does not decorate the response with `__persist: true` is there if query is not persistent', async () => { + it('does not decorate the response with `__persist: true` is there if query is not persistent', () => { const link = getPersistLink().concat(terminatingLink); subscription = execute(link, { query: DEFAULT_QUERY }).subscribe(({ data }) => { diff --git a/spec/frontend/lib/utils/color_utils_spec.js b/spec/frontend/lib/utils/color_utils_spec.js index 87966cf9fba..a5580a3d8d6 100644 --- a/spec/frontend/lib/utils/color_utils_spec.js +++ b/spec/frontend/lib/utils/color_utils_spec.js @@ -63,7 +63,7 @@ describe('Color utils', () => { ${'groups:issues:index'} | ${'gl-dark'} | ${'monokai-light'} | ${true} `( 'is $expected on $page with $bodyClass body class and $ideTheme IDE theme', - async ({ page, bodyClass, ideTheme, expected }) => { + ({ page, bodyClass, ideTheme, expected }) => { document.body.outerHTML = `<body class="${bodyClass}" data-page="${page}"></body>`; window.gon = { user_color_scheme: ideTheme, diff --git a/spec/frontend/lib/utils/intersection_observer_spec.js b/spec/frontend/lib/utils/intersection_observer_spec.js index 71b1daffe0d..8eef403f0ae 100644 --- a/spec/frontend/lib/utils/intersection_observer_spec.js +++ b/spec/frontend/lib/utils/intersection_observer_spec.js @@ -57,7 +57,7 @@ describe('IntersectionObserver Utility', () => { ${true} | ${'IntersectionAppear'} `( 'should emit the correct event on the entry target based on the computed Intersection', - async ({ isIntersecting, event }) => { + ({ isIntersecting, event }) => { const target = document.createElement('div'); observer.addEntry({ target, isIntersecting }); diff --git a/spec/frontend/lib/utils/poll_spec.js b/spec/frontend/lib/utils/poll_spec.js index 63eeb54e850..096a92305dc 100644 --- a/spec/frontend/lib/utils/poll_spec.js +++ b/spec/frontend/lib/utils/poll_spec.js @@ -121,7 +121,7 @@ describe('Poll', () => { }); describe('with delayed initial request', () => { - it('delays the first request', async () => { + it('delays the first request', () => { mockServiceCall({ status: HTTP_STATUS_OK, headers: { 'poll-interval': 1 } }); const Polling = new Poll({ diff --git a/spec/frontend/members/components/table/expiration_datepicker_spec.js b/spec/frontend/members/components/table/expiration_datepicker_spec.js index 15812ee6572..9176a02a447 100644 --- a/spec/frontend/members/components/table/expiration_datepicker_spec.js +++ b/spec/frontend/members/components/table/expiration_datepicker_spec.js @@ -93,7 +93,7 @@ describe('ExpirationDatepicker', () => { }); describe('when datepicker is changed', () => { - beforeEach(async () => { + beforeEach(() => { createComponent(); findDatepicker().vm.$emit('input', new Date('2020-03-17')); diff --git a/spec/frontend/members/utils_spec.js b/spec/frontend/members/utils_spec.js index 4f276e8c9df..c4357e9c1f0 100644 --- a/spec/frontend/members/utils_spec.js +++ b/spec/frontend/members/utils_spec.js @@ -213,7 +213,7 @@ describe('Members Utils', () => { ${'recent_sign_in'} | ${{ sortByKey: 'lastSignIn', sortDesc: false }} ${'oldest_sign_in'} | ${{ sortByKey: 'lastSignIn', sortDesc: true }} `('when `sort` query string param is `$sortParam`', ({ sortParam, expected }) => { - it(`returns ${JSON.stringify(expected)}`, async () => { + it(`returns ${JSON.stringify(expected)}`, () => { setWindowLocation(`?sort=${sortParam}`); expect(parseSortParam(['account', 'granted', 'expires', 'maxRole', 'lastSignIn'])).toEqual( diff --git a/spec/frontend/ml/experiment_tracking/components/delete_button_spec.js b/spec/frontend/ml/experiment_tracking/components/delete_button_spec.js index b8b2aadf2c6..0243cbeb7bf 100644 --- a/spec/frontend/ml/experiment_tracking/components/delete_button_spec.js +++ b/spec/frontend/ml/experiment_tracking/components/delete_button_spec.js @@ -49,7 +49,7 @@ describe('DeleteButton', () => { expect(findModalText().exists()).toBe(true); }); - it('submits the form when primary action is clicked', async () => { + it('submits the form when primary action is clicked', () => { const submitSpy = jest.spyOn(findForm().element, 'submit'); findModal().vm.$emit('primary'); diff --git a/spec/frontend/ml/experiment_tracking/routes/experiments/show/ml_experiments_show_spec.js b/spec/frontend/ml/experiment_tracking/routes/experiments/show/ml_experiments_show_spec.js index 21e1fba95f9..da011feee66 100644 --- a/spec/frontend/ml/experiment_tracking/routes/experiments/show/ml_experiments_show_spec.js +++ b/spec/frontend/ml/experiment_tracking/routes/experiments/show/ml_experiments_show_spec.js @@ -48,7 +48,7 @@ describe('MlExperimentsShow', () => { }); describe('default inputs', () => { - beforeEach(async () => { + beforeEach(() => { createWrapper(); }); diff --git a/spec/frontend/monitoring/components/variables/dropdown_field_spec.js b/spec/frontend/monitoring/components/variables/dropdown_field_spec.js index 96b228fd3b2..e6c5569fa19 100644 --- a/spec/frontend/monitoring/components/variables/dropdown_field_spec.js +++ b/spec/frontend/monitoring/components/variables/dropdown_field_spec.js @@ -53,7 +53,7 @@ describe('Custom variable component', () => { expect(findDropdown().exists()).toBe(true); }); - it('changing dropdown items triggers update', async () => { + it('changing dropdown items triggers update', () => { createShallowWrapper(); findDropdownItems().at(1).vm.$emit('click'); diff --git a/spec/frontend/notes/components/note_actions/timeline_event_button_spec.js b/spec/frontend/notes/components/note_actions/timeline_event_button_spec.js index bee08ee0605..7860e9d45da 100644 --- a/spec/frontend/notes/components/note_actions/timeline_event_button_spec.js +++ b/spec/frontend/notes/components/note_actions/timeline_event_button_spec.js @@ -22,7 +22,7 @@ describe('NoteTimelineEventButton', () => { const findTimelineButton = () => wrapper.findComponent(GlButton); - it('emits click-promote-comment-to-event', async () => { + it('emits click-promote-comment-to-event', () => { findTimelineButton().vm.$emit('click'); expect(wrapper.emitted('click-promote-comment-to-event')).toEqual([[emitData]]); diff --git a/spec/frontend/notes/components/note_form_spec.js b/spec/frontend/notes/components/note_form_spec.js index e385c478dd6..d6413d33c99 100644 --- a/spec/frontend/notes/components/note_form_spec.js +++ b/spec/frontend/notes/components/note_form_spec.js @@ -54,7 +54,7 @@ describe('issue_note_form component', () => { expect(wrapper.vm.noteHash).toBe(`#note_${props.noteId}`); }); - it('return note hash as `#` when `noteId` is empty', async () => { + it('return note hash as `#` when `noteId` is empty', () => { createComponentWrapper({ noteId: '', }); @@ -203,7 +203,7 @@ describe('issue_note_form component', () => { expect(wrapper.emitted('cancelForm')).toBeUndefined(); }); - it('should be possible to update the note', async () => { + it('should be possible to update the note', () => { createComponentWrapper(); const textarea = wrapper.find('textarea'); @@ -227,7 +227,7 @@ describe('issue_note_form component', () => { }); }); - it('should be possible to cancel', async () => { + it('should be possible to cancel', () => { findCancelCommentButton().vm.$emit('click'); expect(wrapper.emitted('cancelForm')).toEqual([[true, false]]); @@ -237,7 +237,7 @@ describe('issue_note_form component', () => { expect(wrapper.findComponent(GlFormCheckbox).exists()).toBe(true); }); - it('hides resolve checkbox', async () => { + it('hides resolve checkbox', () => { createComponentWrapper({ isDraft: false, discussion: { @@ -256,7 +256,7 @@ describe('issue_note_form component', () => { expect(wrapper.findComponent(GlFormCheckbox).exists()).toBe(false); }); - it('hides actions for commits', async () => { + it('hides actions for commits', () => { createComponentWrapper({ discussion: { for_commit: true } }); expect(wrapper.find('.note-form-actions').text()).not.toContain('Start a review'); diff --git a/spec/frontend/notes/components/notes_app_spec.js b/spec/frontend/notes/components/notes_app_spec.js index 832264aa7d3..3fe31506223 100644 --- a/spec/frontend/notes/components/notes_app_spec.js +++ b/spec/frontend/notes/components/notes_app_spec.js @@ -174,7 +174,7 @@ describe('note_app', () => { }); describe('while fetching data', () => { - beforeEach(async () => { + beforeEach(() => { wrapper = mountComponent(); }); diff --git a/spec/frontend/notes/deprecated_notes_spec.js b/spec/frontend/notes/deprecated_notes_spec.js index c4a488282a6..355ecb78187 100644 --- a/spec/frontend/notes/deprecated_notes_spec.js +++ b/spec/frontend/notes/deprecated_notes_spec.js @@ -1,9 +1,9 @@ /* eslint-disable import/no-commonjs, no-new */ +import $ from 'jquery'; import MockAdapter from 'axios-mock-adapter'; import htmlPipelineSchedulesEditSnippets from 'test_fixtures/snippets/show.html'; import htmlPipelineSchedulesEditCommit from 'test_fixtures/commit/show.html'; -import $ from 'jquery'; import '~/behaviors/markdown/render_gfm'; import { setHTMLFixture, resetHTMLFixture } from 'helpers/fixtures'; import { TEST_HOST } from 'helpers/test_constants'; diff --git a/spec/frontend/notes/stores/actions_spec.js b/spec/frontend/notes/stores/actions_spec.js index 0d3ebea7af2..97249d232dc 100644 --- a/spec/frontend/notes/stores/actions_spec.js +++ b/spec/frontend/notes/stores/actions_spec.js @@ -257,14 +257,14 @@ describe('Actions Notes Store', () => { axiosMock.onGet(notesDataMock.notesPath).reply(HTTP_STATUS_OK, pollResponse, pollHeaders); const failureMock = () => axiosMock.onGet(notesDataMock.notesPath).reply(HTTP_STATUS_INTERNAL_SERVER_ERROR); - const advanceAndRAF = async (time) => { + const advanceAndRAF = (time) => { if (time) { jest.advanceTimersByTime(time); } return waitForPromises(); }; - const advanceXMoreIntervals = async (number) => { + const advanceXMoreIntervals = (number) => { const timeoutLength = pollInterval * number; return advanceAndRAF(timeoutLength); @@ -273,7 +273,7 @@ describe('Actions Notes Store', () => { await store.dispatch('poll'); await advanceAndRAF(2); }; - const cleanUp = async () => { + const cleanUp = () => { jest.clearAllTimers(); return store.dispatch('stopPolling'); diff --git a/spec/frontend/notifications/components/custom_notifications_modal_spec.js b/spec/frontend/notifications/components/custom_notifications_modal_spec.js index 0fbd073191e..480d617fcb2 100644 --- a/spec/frontend/notifications/components/custom_notifications_modal_spec.js +++ b/spec/frontend/notifications/components/custom_notifications_modal_spec.js @@ -103,7 +103,7 @@ describe('CustomNotificationsModal', () => { ${1} | ${'new_note'} | ${'New note'} | ${false} | ${false} `( 'renders a checkbox for "$eventName" with checked=$enabled', - async ({ index, eventName, enabled, loading }) => { + ({ index, eventName, enabled, loading }) => { const checkbox = findCheckboxAt(index); expect(checkbox.text()).toContain(eventName); expect(checkbox.vm.$attrs.checked).toBe(enabled); diff --git a/spec/frontend/observability/index_spec.js b/spec/frontend/observability/index_spec.js index 83f72ff72b5..25eb048c62b 100644 --- a/spec/frontend/observability/index_spec.js +++ b/spec/frontend/observability/index_spec.js @@ -52,7 +52,7 @@ describe('renderObservability', () => { ); }); - it('handle route-update events', async () => { + it('handle route-update events', () => { component.vm.$router.push('/something?foo=bar'); component.vm.$emit('route-update', { url: '/some_path' }); expect(component.vm.$router.currentRoute.path).toBe('/something'); diff --git a/spec/frontend/packages_and_registries/harbor_registry/pages/list_spec.js b/spec/frontend/packages_and_registries/harbor_registry/pages/list_spec.js index 63ea8feb1e7..1bc2657822e 100644 --- a/spec/frontend/packages_and_registries/harbor_registry/pages/list_spec.js +++ b/spec/frontend/packages_and_registries/harbor_registry/pages/list_spec.js @@ -74,7 +74,7 @@ describe('Harbor List Page', () => { }); describe('isLoading is true', () => { - it('shows the skeleton loader', async () => { + it('shows the skeleton loader', () => { mountComponent(); fireFirstSortUpdate(); @@ -93,7 +93,7 @@ describe('Harbor List Page', () => { expect(findCliCommands().exists()).toBe(false); }); - it('title has the metadataLoading props set to true', async () => { + it('title has the metadataLoading props set to true', () => { mountComponent(); fireFirstSortUpdate(); diff --git a/spec/frontend/packages_and_registries/package_registry/components/list/package_list_row_spec.js b/spec/frontend/packages_and_registries/package_registry/components/list/package_list_row_spec.js index 91417d2fc9f..52d222ed07b 100644 --- a/spec/frontend/packages_and_registries/package_registry/components/list/package_list_row_spec.js +++ b/spec/frontend/packages_and_registries/package_registry/components/list/package_list_row_spec.js @@ -132,7 +132,7 @@ describe('packages_list_row', () => { }); }); - it('emits the delete event when the delete button is clicked', async () => { + it('emits the delete event when the delete button is clicked', () => { mountComponent({ packageEntity: packageWithoutTags }); findDeleteDropdown().vm.$emit('click'); diff --git a/spec/frontend/packages_and_registries/package_registry/components/list/packages_search_spec.js b/spec/frontend/packages_and_registries/package_registry/components/list/packages_search_spec.js index 1250ecaf61f..82fa5b76367 100644 --- a/spec/frontend/packages_and_registries/package_registry/components/list/packages_search_spec.js +++ b/spec/frontend/packages_and_registries/package_registry/components/list/packages_search_spec.js @@ -54,7 +54,7 @@ describe('Package Search', () => { expect(findRegistrySearch().exists()).toBe(true); }); - it('registry search is mounted after mount', async () => { + it('registry search is mounted after mount', () => { mountComponent(); expect(findRegistrySearch().exists()).toBe(false); diff --git a/spec/frontend/packages_and_registries/package_registry/pages/details_spec.js b/spec/frontend/packages_and_registries/package_registry/pages/details_spec.js index ecc82b73fed..e1765917035 100644 --- a/spec/frontend/packages_and_registries/package_registry/pages/details_spec.js +++ b/spec/frontend/packages_and_registries/package_registry/pages/details_spec.js @@ -313,7 +313,7 @@ describe('PackagesApp', () => { describe('deleting a file', () => { const [fileToDelete] = packageFiles(); - const doDeleteFile = async () => { + const doDeleteFile = () => { findPackageFiles().vm.$emit('delete-files', [fileToDelete]); findDeleteFileModal().vm.$emit('primary'); @@ -433,7 +433,7 @@ describe('PackagesApp', () => { }); describe('deleting multiple files', () => { - const doDeleteFiles = async () => { + const doDeleteFiles = () => { findPackageFiles().vm.$emit('delete-files', packageFiles()); findDeleteFilesModal().vm.$emit('primary'); @@ -636,7 +636,7 @@ describe('PackagesApp', () => { }); describe('dependency links', () => { - it('does not show the dependency links for a non nuget package', async () => { + it('does not show the dependency links for a non nuget package', () => { createComponent(); expect(findDependenciesCountBadge().exists()).toBe(false); diff --git a/spec/frontend/packages_and_registries/package_registry/pages/list_spec.js b/spec/frontend/packages_and_registries/package_registry/pages/list_spec.js index 6cfc80966b5..d2996bad97c 100644 --- a/spec/frontend/packages_and_registries/package_registry/pages/list_spec.js +++ b/spec/frontend/packages_and_registries/package_registry/pages/list_spec.js @@ -85,7 +85,7 @@ describe('PackagesListApp', () => { }); }; - const waitForFirstRequest = async () => { + const waitForFirstRequest = () => { // emit a search update so the query is executed findSearch().vm.$emit('update', { sort: 'NAME_DESC', filters: [] }); return waitForPromises(); diff --git a/spec/frontend/packages_and_registries/settings/group/components/package_settings_spec.js b/spec/frontend/packages_and_registries/settings/group/components/package_settings_spec.js index 22e42f8c0ab..49e76cfbae0 100644 --- a/spec/frontend/packages_and_registries/settings/group/components/package_settings_spec.js +++ b/spec/frontend/packages_and_registries/settings/group/components/package_settings_spec.js @@ -177,7 +177,7 @@ describe('Packages Settings', () => { }); }); - it('renders ExceptionsInput and assigns duplication allowness and exception props', async () => { + it('renders ExceptionsInput and assigns duplication allowness and exception props', () => { mountComponent({ mountFn: mountExtended }); const { genericDuplicatesAllowed, genericDuplicateExceptionRegex } = packageSettings; @@ -192,7 +192,7 @@ describe('Packages Settings', () => { }); }); - it('on update event calls the mutation', async () => { + it('on update event calls the mutation', () => { const mutationResolver = jest.fn().mockResolvedValue(groupPackageSettingsMutationMock()); mountComponent({ mountFn: mountExtended, mutationResolver }); diff --git a/spec/frontend/packages_and_registries/settings/project/settings/components/container_expiration_policy_form_spec.js b/spec/frontend/packages_and_registries/settings/project/settings/components/container_expiration_policy_form_spec.js index 57b48407174..a68087f7f57 100644 --- a/spec/frontend/packages_and_registries/settings/project/settings/components/container_expiration_policy_form_spec.js +++ b/spec/frontend/packages_and_registries/settings/project/settings/components/container_expiration_policy_form_spec.js @@ -46,7 +46,7 @@ describe('Container Expiration Policy Settings Form', () => { const findOlderThanDropdown = () => wrapper.find('[data-testid="older-than-dropdown"]'); const findRemoveRegexInput = () => wrapper.find('[data-testid="remove-regex-input"]'); - const submitForm = async () => { + const submitForm = () => { findForm().trigger('submit'); return waitForPromises(); }; diff --git a/spec/frontend/packages_and_registries/settings/project/settings/components/packages_cleanup_policy_form_spec.js b/spec/frontend/packages_and_registries/settings/project/settings/components/packages_cleanup_policy_form_spec.js index b9c0c38bf9e..50b72d3ad72 100644 --- a/spec/frontend/packages_and_registries/settings/project/settings/components/packages_cleanup_policy_form_spec.js +++ b/spec/frontend/packages_and_registries/settings/project/settings/components/packages_cleanup_policy_form_spec.js @@ -48,7 +48,7 @@ describe('Packages Cleanup Policy Settings Form', () => { wrapper.findByTestId('keep-n-duplicated-package-files-dropdown'); const findNextRunAt = () => wrapper.findByTestId('next-run-at'); - const submitForm = async () => { + const submitForm = () => { findForm().trigger('submit'); return waitForPromises(); }; diff --git a/spec/frontend/packages_and_registries/shared/components/persisted_search_spec.js b/spec/frontend/packages_and_registries/shared/components/persisted_search_spec.js index 1484377a475..c1e86080d29 100644 --- a/spec/frontend/packages_and_registries/shared/components/persisted_search_spec.js +++ b/spec/frontend/packages_and_registries/shared/components/persisted_search_spec.js @@ -51,7 +51,7 @@ describe('Persisted Search', () => { expect(findRegistrySearch().exists()).toBe(true); }); - it('registry search is mounted after mount', async () => { + it('registry search is mounted after mount', () => { mountComponent(); expect(findRegistrySearch().exists()).toBe(false); diff --git a/spec/frontend/packages_and_registries/shared/components/registry_list_spec.js b/spec/frontend/packages_and_registries/shared/components/registry_list_spec.js index a4e0d267023..85b4ca95d5d 100644 --- a/spec/frontend/packages_and_registries/shared/components/registry_list_spec.js +++ b/spec/frontend/packages_and_registries/shared/components/registry_list_spec.js @@ -116,7 +116,7 @@ describe('Registry List', () => { expect(findDeleteSelected().exists()).toBe(false); }); - it('populates the first slot prop correctly', async () => { + it('populates the first slot prop correctly', () => { expect(findScopedSlots().at(0).exists()).toBe(true); // it's the first slot diff --git a/spec/frontend/pages/admin/projects/components/namespace_select_spec.js b/spec/frontend/pages/admin/projects/components/namespace_select_spec.js index 834d14e0fb3..c00dbc0ec02 100644 --- a/spec/frontend/pages/admin/projects/components/namespace_select_spec.js +++ b/spec/frontend/pages/admin/projects/components/namespace_select_spec.js @@ -45,7 +45,7 @@ describe('NamespaceSelect', () => { expect(findNamespaceInput().exists()).toBe(false); }); - it('sets appropriate props', async () => { + it('sets appropriate props', () => { expect(findListbox().props()).toMatchObject({ items: [ { text: 'user: Administrator', value: '10' }, @@ -84,7 +84,7 @@ describe('NamespaceSelect', () => { expect(findNamespaceInput().attributes('value')).toBe(selectId); }); - it('updates the listbox value', async () => { + it('updates the listbox value', () => { expect(findListbox().props()).toMatchObject({ selected: selectId, toggleText: expectToggleText, diff --git a/spec/frontend/pages/import/bitbucket_server/components/bitbucket_server_status_table_spec.js b/spec/frontend/pages/import/bitbucket_server/components/bitbucket_server_status_table_spec.js index b020caa3010..8eab5061e97 100644 --- a/spec/frontend/pages/import/bitbucket_server/components/bitbucket_server_status_table_spec.js +++ b/spec/frontend/pages/import/bitbucket_server/components/bitbucket_server_status_table_spec.js @@ -39,7 +39,7 @@ describe('BitbucketServerStatusTable', () => { expect(wrapper.findComponent(BitbucketStatusTable).exists()).toBe(true); }); - it('renders Reconfigure button', async () => { + it('renders Reconfigure button', () => { createComponent(BitbucketStatusTableStub); expect(findReconfigureButton().attributes().href).toBe('/reconfigure'); expect(findReconfigureButton().text()).toBe('Reconfigure'); diff --git a/spec/frontend/pages/import/bulk_imports/history/components/bulk_imports_history_app_spec.js b/spec/frontend/pages/import/bulk_imports/history/components/bulk_imports_history_app_spec.js index 477511cde64..8a7fc57c409 100644 --- a/spec/frontend/pages/import/bulk_imports/history/components/bulk_imports_history_app_spec.js +++ b/spec/frontend/pages/import/bulk_imports/history/components/bulk_imports_history_app_spec.js @@ -192,7 +192,7 @@ describe('BulkImportsHistoryApp', () => { return axios.waitForAll(); }); - it('renders details button if relevant item has failures', async () => { + it('renders details button if relevant item has failures', () => { expect( extendedWrapper(wrapper.find('tbody').findAll('tr').at(1)).findByText('Details').exists(), ).toBe(true); diff --git a/spec/frontend/pages/import/history/components/import_history_app_spec.js b/spec/frontend/pages/import/history/components/import_history_app_spec.js index bc9762abf86..8e14b5a24f8 100644 --- a/spec/frontend/pages/import/history/components/import_history_app_spec.js +++ b/spec/frontend/pages/import/history/components/import_history_app_spec.js @@ -166,7 +166,7 @@ describe('ImportHistoryApp', () => { return axios.waitForAll(); }); - it('renders details button if relevant item has failed', async () => { + it('renders details button if relevant item has failed', () => { expect( extendedWrapper(wrapper.find('tbody').findAll('tr').at(1)).findByText('Details').exists(), ).toBe(true); diff --git a/spec/frontend/pages/shared/wikis/components/wiki_form_spec.js b/spec/frontend/pages/shared/wikis/components/wiki_form_spec.js index c6ca1b10dc9..ddaa3df71e8 100644 --- a/spec/frontend/pages/shared/wikis/components/wiki_form_spec.js +++ b/spec/frontend/pages/shared/wikis/components/wiki_form_spec.js @@ -304,7 +304,7 @@ describe('WikiForm', () => { expect(findFormat().element.getAttribute('disabled')).toBeDefined(); }); - it('sends tracking event when editor loads', async () => { + it('sends tracking event when editor loads', () => { expect(trackingSpy).toHaveBeenCalledWith(undefined, CONTENT_EDITOR_LOADED_ACTION, { label: WIKI_CONTENT_EDITOR_TRACKING_LABEL, }); @@ -318,7 +318,7 @@ describe('WikiForm', () => { await triggerFormSubmit(); }); - it('triggers tracking events on form submit', async () => { + it('triggers tracking events on form submit', () => { expect(trackingSpy).toHaveBeenCalledWith(undefined, SAVED_USING_CONTENT_EDITOR_ACTION, { label: WIKI_CONTENT_EDITOR_TRACKING_LABEL, }); diff --git a/spec/frontend/performance_bar/components/performance_bar_app_spec.js b/spec/frontend/performance_bar/components/performance_bar_app_spec.js index 0154ad052bd..7a018236314 100644 --- a/spec/frontend/performance_bar/components/performance_bar_app_spec.js +++ b/spec/frontend/performance_bar/components/performance_bar_app_spec.js @@ -4,39 +4,50 @@ import PerformanceBarApp from '~/performance_bar/components/performance_bar_app. import PerformanceBarStore from '~/performance_bar/stores/performance_bar_store'; describe('performance bar app', () => { + let wrapper; const store = new PerformanceBarStore(); store.addRequest('123', 'https://gitlab.com', '', {}, 'GET'); - const wrapper = mount(PerformanceBarApp, { - propsData: { - store, - env: 'development', - requestId: '123', - requestMethod: 'GET', - statsUrl: 'https://log.gprd.gitlab.net/app/dashboards#/view/', - peekUrl: '/-/peek/results', - }, + const createComponent = () => { + wrapper = mount(PerformanceBarApp, { + propsData: { + store, + env: 'development', + requestId: '123', + requestMethod: 'GET', + statsUrl: 'https://log.gprd.gitlab.net/app/dashboards#/view/', + peekUrl: '/-/peek/results', + }, + }); + }; + + beforeEach(() => { + createComponent(); }); - const flamegraphDiv = () => wrapper.find('#peek-flamegraph'); - const flamegrapLinks = () => flamegraphDiv().findAllComponents(GlLink); + describe('flamegraph buttons', () => { + const flamegraphDiv = () => wrapper.find('#peek-flamegraph'); + const flamegraphLinks = () => flamegraphDiv().findAllComponents(GlLink); + + it('creates three flamegraph buttons based on the path', () => { + expect(flamegraphLinks()).toHaveLength(3); + + ['wall', 'cpu', 'object'].forEach((path, index) => { + expect(flamegraphLinks().at(index).attributes('href')).toBe( + `https://gitlab.com?performance_bar=flamegraph&stackprof_mode=${path}`, + ); + }); + }); + }); - it('creates three flamegraph buttons based on the path', () => { - expect(flamegrapLinks()).toHaveLength(3); + describe('memory report button', () => { + const memoryReportDiv = () => wrapper.find('#peek-memory-report'); + const memoryReportLink = () => memoryReportDiv().findComponent(GlLink); - ['wall', 'cpu', 'object'].forEach((path, index) => { - expect(flamegrapLinks().at(index).attributes('href')).toBe( - `https://gitlab.com?performance_bar=flamegraph&stackprof_mode=${path}`, + it('creates memory report button', () => { + expect(memoryReportLink().attributes('href')).toEqual( + 'https://gitlab.com?performance_bar=memory', ); }); - expect(flamegrapLinks().at(0).attributes('href')).toEqual( - 'https://gitlab.com?performance_bar=flamegraph&stackprof_mode=wall', - ); - expect(flamegrapLinks().at(1).attributes('href')).toEqual( - 'https://gitlab.com?performance_bar=flamegraph&stackprof_mode=cpu', - ); - expect(flamegrapLinks().at(2).attributes('href')).toEqual( - 'https://gitlab.com?performance_bar=flamegraph&stackprof_mode=object', - ); }); it('sets the class to match the environment', () => { diff --git a/spec/frontend/pipeline_wizard/components/commit_spec.js b/spec/frontend/pipeline_wizard/components/commit_spec.js index 8f44a6c085b..7095525e948 100644 --- a/spec/frontend/pipeline_wizard/components/commit_spec.js +++ b/spec/frontend/pipeline_wizard/components/commit_spec.js @@ -128,7 +128,7 @@ describe('Pipeline Wizard - Commit Page', () => { await waitForPromises(); }); - it('will not show an error', async () => { + it('will not show an error', () => { expect(wrapper.findByTestId('commit-error').exists()).not.toBe(true); }); @@ -155,7 +155,7 @@ describe('Pipeline Wizard - Commit Page', () => { await waitForPromises(); }); - it('will show an error', async () => { + it('will show an error', () => { expect(wrapper.findByTestId('commit-error').exists()).toBe(true); expect(wrapper.findByTestId('commit-error').text()).toBe(i18n.errors.commitError); }); @@ -236,11 +236,11 @@ describe('Pipeline Wizard - Commit Page', () => { await waitForPromises(); }); - it('sets up without error', async () => { + it('sets up without error', () => { expect(consoleSpy).not.toHaveBeenCalled(); }); - it('does not show a load error', async () => { + it('does not show a load error', () => { expect(wrapper.findByTestId('load-error').exists()).not.toBe(true); }); diff --git a/spec/frontend/pipeline_wizard/components/step_nav_spec.js b/spec/frontend/pipeline_wizard/components/step_nav_spec.js index 8e2f0ab0281..e80eb01ea7a 100644 --- a/spec/frontend/pipeline_wizard/components/step_nav_spec.js +++ b/spec/frontend/pipeline_wizard/components/step_nav_spec.js @@ -25,7 +25,7 @@ describe('Pipeline Wizard - Step Navigation Component', () => { ${'has prev, but not next'} | ${true} | ${false} ${'has next, but not prev'} | ${false} | ${true} ${'has both next and prev'} | ${true} | ${true} - `('$scenario', async ({ showBackButton, showNextButton }) => { + `('$scenario', ({ showBackButton, showNextButton }) => { createComponent({ showBackButton, showNextButton }); expect(prevButton.exists()).toBe(showBackButton); @@ -53,13 +53,13 @@ describe('Pipeline Wizard - Step Navigation Component', () => { expect(wrapper.emitted().next.length).toBe(1); }); - it('enables the next button if nextButtonEnabled ist set to true', async () => { + it('enables the next button if nextButtonEnabled ist set to true', () => { createComponent({ nextButtonEnabled: true }); expect(nextButton.attributes('disabled')).not.toBe('disabled'); }); - it('disables the next button if nextButtonEnabled ist set to false', async () => { + it('disables the next button if nextButtonEnabled ist set to false', () => { createComponent({ nextButtonEnabled: false }); expect(nextButton.attributes('disabled')).toBe('disabled'); diff --git a/spec/frontend/pipeline_wizard/components/step_spec.js b/spec/frontend/pipeline_wizard/components/step_spec.js index 00b57f95ccc..4d5f563228c 100644 --- a/spec/frontend/pipeline_wizard/components/step_spec.js +++ b/spec/frontend/pipeline_wizard/components/step_spec.js @@ -207,7 +207,7 @@ describe('Pipeline Wizard - Step Page', () => { findInputWrappers(); }); - it('injects the template when an input wrapper emits a beforeUpdate:compiled event', async () => { + it('injects the template when an input wrapper emits a beforeUpdate:compiled event', () => { input1.vm.$emit('beforeUpdate:compiled'); expect(wrapper.vm.compiled.toString()).toBe(compiledYamlAfterInitialLoad); diff --git a/spec/frontend/pipeline_wizard/components/widgets/list_spec.js b/spec/frontend/pipeline_wizard/components/widgets/list_spec.js index b0eb7279a94..df8841e6ad3 100644 --- a/spec/frontend/pipeline_wizard/components/widgets/list_spec.js +++ b/spec/frontend/pipeline_wizard/components/widgets/list_spec.js @@ -51,7 +51,7 @@ describe('Pipeline Wizard - List Widget', () => { expect(findGlFormGroup().attributes('labeldescription')).toBe(defaultProps.description); }); - it('sets the input field type attribute to "text"', async () => { + it('sets the input field type attribute to "text"', () => { createComponent(); expect(findFirstGlFormInputGroup().attributes('type')).toBe('text'); @@ -164,7 +164,7 @@ describe('Pipeline Wizard - List Widget', () => { }); describe('form validation', () => { - it('does not show validation state when untouched', async () => { + it('does not show validation state when untouched', () => { createComponent({}, mountExtended); expect(findGlFormGroup().classes()).not.toContain('is-valid'); expect(findGlFormGroup().classes()).not.toContain('is-invalid'); diff --git a/spec/frontend/pipeline_wizard/components/widgets/text_spec.js b/spec/frontend/pipeline_wizard/components/widgets/text_spec.js index a11c0214d15..abfb4a33c0f 100644 --- a/spec/frontend/pipeline_wizard/components/widgets/text_spec.js +++ b/spec/frontend/pipeline_wizard/components/widgets/text_spec.js @@ -123,7 +123,7 @@ describe('Pipeline Wizard - Text Widget', () => { expect(findGlFormGroup().classes()).toContain('is-invalid'); }); - it('does not update validation if not required', async () => { + it('does not update validation if not required', () => { createComponent({ pattern: null, validate: true, diff --git a/spec/frontend/pipeline_wizard/components/wrapper_spec.js b/spec/frontend/pipeline_wizard/components/wrapper_spec.js index 1056602c912..2808fd0c7a5 100644 --- a/spec/frontend/pipeline_wizard/components/wrapper_spec.js +++ b/spec/frontend/pipeline_wizard/components/wrapper_spec.js @@ -82,7 +82,7 @@ describe('Pipeline Wizard - wrapper.vue', () => { expect(wrapper.findByTestId('editor-header').text()).toBe(expectedMessage); }); - it('shows the editor header with a custom filename', async () => { + it('shows the editor header with a custom filename', () => { const filename = 'my-file.yml'; createComponent({ filename, @@ -142,7 +142,7 @@ describe('Pipeline Wizard - wrapper.vue', () => { }); if (expectCommitStepShown) { - it('does not show the step wrapper', async () => { + it('does not show the step wrapper', () => { expect(wrapper.findComponent(WizardStep).isVisible()).toBe(false); }); @@ -150,7 +150,7 @@ describe('Pipeline Wizard - wrapper.vue', () => { expect(wrapper.findComponent(CommitStep).isVisible()).toBe(true); }); } else { - it('passes the correct step config to the step component', async () => { + it('passes the correct step config to the step component', () => { expect(getStepWrapper().props('inputs')).toMatchObject(expectStepDef.inputs); }); @@ -250,7 +250,7 @@ describe('Pipeline Wizard - wrapper.vue', () => { }); describe('integration test', () => { - beforeEach(async () => { + beforeEach(() => { createComponent({}, mountExtended); }); diff --git a/spec/frontend/pipelines/components/dag/dag_spec.js b/spec/frontend/pipelines/components/dag/dag_spec.js index e2dc8120309..5483c1c7b99 100644 --- a/spec/frontend/pipelines/components/dag/dag_spec.js +++ b/spec/frontend/pipelines/components/dag/dag_spec.js @@ -59,7 +59,7 @@ describe('Pipeline DAG graph wrapper', () => { }); }); - it('does not render the graph', async () => { + it('does not render the graph', () => { expect(getGraph().exists()).toBe(false); }); @@ -70,7 +70,7 @@ describe('Pipeline DAG graph wrapper', () => { describe('when all query variables are defined', () => { describe('but the parse fails', () => { - beforeEach(async () => { + beforeEach(() => { createComponent({ graphData: unparseableGraph, }); @@ -88,7 +88,7 @@ describe('Pipeline DAG graph wrapper', () => { }); describe('parse succeeds', () => { - beforeEach(async () => { + beforeEach(() => { createComponent({ method: mount }); }); @@ -102,7 +102,7 @@ describe('Pipeline DAG graph wrapper', () => { }); describe('parse succeeds, but the resulting graph is too small', () => { - beforeEach(async () => { + beforeEach(() => { createComponent({ graphData: tooSmallGraph, }); @@ -120,7 +120,7 @@ describe('Pipeline DAG graph wrapper', () => { }); describe('the returned data is empty', () => { - beforeEach(async () => { + beforeEach(() => { createComponent({ method: mount, graphData: graphWithoutDependencies, @@ -139,7 +139,7 @@ describe('Pipeline DAG graph wrapper', () => { }); describe('annotations', () => { - beforeEach(async () => { + beforeEach(() => { createComponent(); }); diff --git a/spec/frontend/pipelines/components/pipeline_mini_graph/pipeline_stage_spec.js b/spec/frontend/pipelines/components/pipeline_mini_graph/pipeline_stage_spec.js index 864f2d66f60..21d92fec9bf 100644 --- a/spec/frontend/pipelines/components/pipeline_mini_graph/pipeline_stage_spec.js +++ b/spec/frontend/pipelines/components/pipeline_mini_graph/pipeline_stage_spec.js @@ -129,7 +129,7 @@ describe('Pipelines stage component', () => { await axios.waitForAll(); }); - it('renders the received data and emits the correct events', async () => { + it('renders the received data and emits the correct events', () => { expect(findDropdownMenu().text()).toContain(stageReply.latest_statuses[0].name); expect(findDropdownMenuTitle().text()).toContain(stageReply.name); expect(eventHub.$emit).toHaveBeenCalledWith('clickedDropdown'); diff --git a/spec/frontend/pipelines/graph/linked_pipeline_spec.js b/spec/frontend/pipelines/graph/linked_pipeline_spec.js index efe891fa47f..bf92cd585d9 100644 --- a/spec/frontend/pipelines/graph/linked_pipeline_spec.js +++ b/spec/frontend/pipelines/graph/linked_pipeline_spec.js @@ -192,7 +192,7 @@ describe('Linked pipeline', () => { }; describe('when retryable', () => { - beforeEach(async () => { + beforeEach(() => { createComponent({ propsData: retryablePipeline }); }); diff --git a/spec/frontend/pipelines/pipelines_manual_actions_spec.js b/spec/frontend/pipelines/pipelines_manual_actions_spec.js index e9695d57f93..e47e57db887 100644 --- a/spec/frontend/pipelines/pipelines_manual_actions_spec.js +++ b/spec/frontend/pipelines/pipelines_manual_actions_spec.js @@ -73,7 +73,7 @@ describe('Pipeline manual actions', () => { findDropdown().vm.$emit('shown'); }); - it('display loading state while actions are being fetched', async () => { + it('display loading state while actions are being fetched', () => { expect(findAllDropdownItems().at(0).text()).toBe('Loading...'); expect(findLoadingIcon().exists()).toBe(true); expect(findAllDropdownItems()).toHaveLength(1); diff --git a/spec/frontend/pipelines/pipelines_spec.js b/spec/frontend/pipelines/pipelines_spec.js index 48539d84024..44f345fdf4e 100644 --- a/spec/frontend/pipelines/pipelines_spec.js +++ b/spec/frontend/pipelines/pipelines_spec.js @@ -245,7 +245,7 @@ describe('Pipelines', () => { await waitForPromises(); }); - it('should filter pipelines', async () => { + it('should filter pipelines', () => { expect(findPipelinesTable().exists()).toBe(true); expect(findPipelineUrlLinks()).toHaveLength(1); @@ -287,7 +287,7 @@ describe('Pipelines', () => { await waitForPromises(); }); - it('should filter pipelines', async () => { + it('should filter pipelines', () => { expect(findEmptyState().text()).toBe('There are currently no pipelines.'); }); @@ -330,11 +330,11 @@ describe('Pipelines', () => { await waitForPromises(); }); - it('requests data with query params on filter submit', async () => { + it('requests data with query params on filter submit', () => { expect(mock.history.get[1].params).toEqual(expectedParams); }); - it('renders filtered pipelines', async () => { + it('renders filtered pipelines', () => { expect(findPipelineUrlLinks()).toHaveLength(1); expect(findPipelineUrlLinks().at(0).text()).toBe(`#${mockFilteredPipeline.id}`); }); @@ -356,7 +356,7 @@ describe('Pipelines', () => { await waitForPromises(); }); - it('requests data with query params on filter submit', async () => { + it('requests data with query params on filter submit', () => { expect(mock.history.get[1].params).toEqual({ page: '1', scope: 'all' }); }); @@ -516,7 +516,7 @@ describe('Pipelines', () => { expect(findNavigationTabs().exists()).toBe(true); }); - it('is loading after a time', async () => { + it('is loading after a time', () => { expect(findPipelineUrlLinks()).toHaveLength(mockPipelinesIds.length); expect(findPipelineUrlLinks().at(0).text()).toBe(`#${mockPipelinesIds[0]}`); expect(findPipelineUrlLinks().at(1).text()).toBe(`#${mockPipelinesIds[1]}`); @@ -727,7 +727,7 @@ describe('Pipelines', () => { }); describe('when pipelines cannot be loaded', () => { - beforeEach(async () => { + beforeEach(() => { mock.onGet(mockPipelinesEndpoint).reply(HTTP_STATUS_INTERNAL_SERVER_ERROR, {}); }); diff --git a/spec/frontend/profile/account/components/update_username_spec.js b/spec/frontend/profile/account/components/update_username_spec.js index d922820601e..3cb9cf3622a 100644 --- a/spec/frontend/profile/account/components/update_username_spec.js +++ b/spec/frontend/profile/account/components/update_username_spec.js @@ -93,7 +93,7 @@ describe('UpdateUsername component', () => { await findNewUsernameInput().setValue(newUsername); }); - it('confirmation modal contains proper header and body', async () => { + it('confirmation modal contains proper header and body', () => { const { modal } = findElements(); expect(modal.props('title')).toBe('Change username?'); diff --git a/spec/frontend/projects/commit/components/branches_dropdown_spec.js b/spec/frontend/projects/commit/components/branches_dropdown_spec.js index 5210abe154d..bff40c2bc39 100644 --- a/spec/frontend/projects/commit/components/branches_dropdown_spec.js +++ b/spec/frontend/projects/commit/components/branches_dropdown_spec.js @@ -59,7 +59,7 @@ describe('BranchesDropdown', () => { }); describe('Selecting Dropdown Item', () => { - it('emits event', async () => { + it('emits event', () => { findDropdown().vm.$emit('select', '_anything_'); expect(wrapper.emitted()).toHaveProperty('input'); diff --git a/spec/frontend/projects/commit/components/form_modal_spec.js b/spec/frontend/projects/commit/components/form_modal_spec.js index ed57188dea2..d40e2d7a48c 100644 --- a/spec/frontend/projects/commit/components/form_modal_spec.js +++ b/spec/frontend/projects/commit/components/form_modal_spec.js @@ -148,7 +148,7 @@ describe('CommitFormModal', () => { createComponent({ method: mountExtended }); }); - it('Action primary button dispatches submit action', async () => { + it('Action primary button dispatches submit action', () => { getByText(mockData.modalPropsData.i18n.actionPrimaryText).trigger('click'); expect(wrapper.vm.$refs.form.$el.submit).toHaveBeenCalled(); diff --git a/spec/frontend/projects/new/components/new_project_url_select_spec.js b/spec/frontend/projects/new/components/new_project_url_select_spec.js index fa720f4487c..ceac4435282 100644 --- a/spec/frontend/projects/new/components/new_project_url_select_spec.js +++ b/spec/frontend/projects/new/components/new_project_url_select_spec.js @@ -247,7 +247,7 @@ describe('NewProjectUrlSelect component', () => { eventHub.$emit('select-template', getIdFromGraphQLId(id), fullPath); }); - it('filters the dropdown items to the selected group and children', async () => { + it('filters the dropdown items to the selected group and children', () => { const listItems = wrapper.findAll('li'); expect(listItems).toHaveLength(3); diff --git a/spec/frontend/projects/settings/components/transfer_project_form_spec.js b/spec/frontend/projects/settings/components/transfer_project_form_spec.js index d8c2cf83f38..a92ac1bed9d 100644 --- a/spec/frontend/projects/settings/components/transfer_project_form_spec.js +++ b/spec/frontend/projects/settings/components/transfer_project_form_spec.js @@ -64,17 +64,17 @@ describe('Transfer project form', () => { expect(findTransferLocations().props('value')).toEqual(selectedItem); }); - it('emits the `selectTransferLocation` event when a namespace is selected', async () => { + it('emits the `selectTransferLocation` event when a namespace is selected', () => { const args = [selectedItem.id]; expect(wrapper.emitted('selectTransferLocation')).toEqual([args]); }); - it('enables the confirm button', async () => { + it('enables the confirm button', () => { expect(findConfirmDanger().attributes('disabled')).toBeUndefined(); }); - it('clicking the confirm button emits the `confirm` event', async () => { + it('clicking the confirm button emits the `confirm` event', () => { findConfirmDanger().vm.$emit('confirm'); expect(wrapper.emitted('confirm')).toBeDefined(); diff --git a/spec/frontend/projects/settings/topics/components/topics_token_selector_spec.js b/spec/frontend/projects/settings/topics/components/topics_token_selector_spec.js index 4b94c179f74..b2c03352cdc 100644 --- a/spec/frontend/projects/settings/topics/components/topics_token_selector_spec.js +++ b/spec/frontend/projects/settings/topics/components/topics_token_selector_spec.js @@ -83,7 +83,7 @@ describe('TopicsTokenSelector', () => { }); }); - it('passes topic title to the avatar', async () => { + it('passes topic title to the avatar', () => { createComponent(); const avatars = findAllAvatars(); diff --git a/spec/frontend/projects/settings_service_desk/components/service_desk_root_spec.js b/spec/frontend/projects/settings_service_desk/components/service_desk_root_spec.js index 4d0d2191176..acf15fc5b11 100644 --- a/spec/frontend/projects/settings_service_desk/components/service_desk_root_spec.js +++ b/spec/frontend/projects/settings_service_desk/components/service_desk_root_spec.js @@ -147,7 +147,7 @@ describe('ServiceDeskRoot', () => { await waitForPromises(); }); - it('sends a request to update template', async () => { + it('sends a request to update template', () => { expect(spy).toHaveBeenCalledWith(provideData.endpoint, { issue_template_key: 'Bug', outgoing_name: 'GitLab Support Bot', diff --git a/spec/frontend/protected_branches/protected_branch_edit_spec.js b/spec/frontend/protected_branches/protected_branch_edit_spec.js index 4141d000a1c..e1966908452 100644 --- a/spec/frontend/protected_branches/protected_branch_edit_spec.js +++ b/spec/frontend/protected_branches/protected_branch_edit_spec.js @@ -115,7 +115,7 @@ describe('ProtectedBranchEdit', () => { }); describe('when clicked', () => { - beforeEach(async () => { + beforeEach(() => { mock .onPatch(TEST_URL, { protected_branch: { [patchParam]: true } }) .replyOnce(HTTP_STATUS_OK, {}); diff --git a/spec/frontend/vue_merge_request_widget/mr_widget_options_spec.js b/spec/frontend/vue_merge_request_widget/mr_widget_options_spec.js index dfc2ee8e13c..413ce0a930a 100644 --- a/spec/frontend/vue_merge_request_widget/mr_widget_options_spec.js +++ b/spec/frontend/vue_merge_request_widget/mr_widget_options_spec.js @@ -470,15 +470,15 @@ describe('MrWidgetOptions', () => { }); it('should call setFavicon method', async () => { - wrapper.vm.mr.ciStatusFaviconPath = overlayDataUrl; + wrapper.vm.mr.faviconOverlayPath = overlayDataUrl; await wrapper.vm.setFaviconHelper(); expect(setFaviconOverlay).toHaveBeenCalledWith(overlayDataUrl); }); - it('should not call setFavicon when there is no ciStatusFaviconPath', async () => { - wrapper.vm.mr.ciStatusFaviconPath = null; + it('should not call setFavicon when there is no faviconOverlayPath', async () => { + wrapper.vm.mr.faviconOverlayPath = null; await wrapper.vm.setFaviconHelper(); expect(faviconElement.getAttribute('href')).toEqual(null); }); diff --git a/spec/frontend/vue_shared/components/user_popover/user_popover_spec.js b/spec/frontend/vue_shared/components/user_popover/user_popover_spec.js index 8ecab5cc043..79ca6203459 100644 --- a/spec/frontend/vue_shared/components/user_popover/user_popover_spec.js +++ b/spec/frontend/vue_shared/components/user_popover/user_popover_spec.js @@ -1,5 +1,6 @@ import { GlSkeletonLoader, GlIcon } from '@gitlab/ui'; -import { loadHTMLFixture, resetHTMLFixture } from 'helpers/fixtures'; +import mrDiffCommentFixture from 'test_fixtures/merge_requests/diff_comment.html'; +import { setHTMLFixture, resetHTMLFixture } from 'helpers/fixtures'; import { sprintf } from '~/locale'; import { mountExtended } from 'helpers/vue_test_utils_helper'; import { AVAILABILITY_STATUS } from '~/set_status_modal/constants'; @@ -41,12 +42,10 @@ const DEFAULT_PROPS = { }; describe('User Popover Component', () => { - const fixtureTemplate = 'merge_requests/diff_comment.html'; - let wrapper; beforeEach(() => { - loadHTMLFixture(fixtureTemplate); + setHTMLFixture(mrDiffCommentFixture); gon.features = {}; }); diff --git a/spec/helpers/merge_requests_helper_spec.rb b/spec/helpers/merge_requests_helper_spec.rb index 6b43e97a0b4..3a06e7ad089 100644 --- a/spec/helpers/merge_requests_helper_spec.rb +++ b/spec/helpers/merge_requests_helper_spec.rb @@ -4,6 +4,7 @@ require 'spec_helper' RSpec.describe MergeRequestsHelper, feature_category: :code_review_workflow do include ProjectForksHelper + include IconsHelper describe '#format_mr_branch_names' do describe 'within the same project' do @@ -28,7 +29,7 @@ RSpec.describe MergeRequestsHelper, feature_category: :code_review_workflow do end describe '#merge_path_description' do - let(:project) { create(:project) } + let_it_be(:project) { create(:project) } let(:forked_project) { fork_project(project) } let(:merge_request_forked) { create(:merge_request, source_project: forked_project, target_project: project) } let(:merge_request) { create(:merge_request, source_project: project, target_project: project) } @@ -150,4 +151,27 @@ RSpec.describe MergeRequestsHelper, feature_category: :code_review_workflow do end end end + + describe '#merge_request_source_branch' do + let_it_be(:project) { create(:project) } + let(:forked_project) { fork_project(project) } + let(:merge_request_forked) { create(:merge_request, source_project: forked_project, target_project: project) } + let(:merge_request) { create(:merge_request, source_project: project, target_project: project) } + + context 'when merge request is a fork' do + subject { merge_request_source_branch(merge_request_forked) } + + it 'does show the fork icon' do + expect(subject).to match(/fork/) + end + end + + context 'when merge request is not a fork' do + subject { merge_request_source_branch(merge_request) } + + it 'does not show the fork icon' do + expect(subject).not_to match(/fork/) + end + end + end end diff --git a/spec/lib/gitlab/favicon_spec.rb b/spec/lib/gitlab/favicon_spec.rb index 884425dab3b..033fa5d1b42 100644 --- a/spec/lib/gitlab/favicon_spec.rb +++ b/spec/lib/gitlab/favicon_spec.rb @@ -40,14 +40,22 @@ RSpec.describe Gitlab::Favicon, :request_store do end end - describe '.status_overlay' do - subject { described_class.status_overlay('favicon_status_created') } + describe '.ci_status_overlay' do + subject { described_class.ci_status_overlay('favicon_status_created') } it 'returns the overlay for the status' do expect(subject).to match_asset_path '/assets/ci_favicons/favicon_status_created.png' end end + describe '.mr_status_overlay' do + subject { described_class.mr_status_overlay('favicon_status_merged') } + + it 'returns the overlay for the status' do + expect(subject).to match_asset_path '/assets/mr_favicons/favicon_status_merged.png' + end + end + describe '.available_status_names' do subject { described_class.available_status_names } diff --git a/spec/models/ci/pipeline_spec.rb b/spec/models/ci/pipeline_spec.rb index 263db8e58c7..ee1410ade91 100644 --- a/spec/models/ci/pipeline_spec.rb +++ b/spec/models/ci/pipeline_spec.rb @@ -444,6 +444,16 @@ RSpec.describe Ci::Pipeline, :mailer, factory_default: :keep, feature_category: end end + describe '.preload_pipeline_metadata' do + let_it_be(:pipeline) { create(:ci_empty_pipeline, project: project, user: user, name: 'Chatops pipeline') } + + it 'loads associations' do + result = described_class.preload_pipeline_metadata.first + + expect(result.association(:pipeline_metadata).loaded?).to be(true) + end + end + describe '.ci_sources' do subject { described_class.ci_sources } diff --git a/spec/requests/api/ci/pipelines_spec.rb b/spec/requests/api/ci/pipelines_spec.rb index 4e81a052ecf..9660778bc91 100644 --- a/spec/requests/api/ci/pipelines_spec.rb +++ b/spec/requests/api/ci/pipelines_spec.rb @@ -14,7 +14,7 @@ RSpec.describe API::Ci::Pipelines, feature_category: :continuous_integration do let_it_be(:pipeline) do create(:ci_empty_pipeline, project: project, sha: project.commit.id, - ref: project.default_branch, user: user) + ref: project.default_branch, user: user, name: 'Build pipeline') end before do @@ -41,10 +41,46 @@ RSpec.describe API::Ci::Pipelines, feature_category: :continuous_integration do it 'includes pipeline source' do get api("/projects/#{project.id}/pipelines", user) - expect(json_response.first.keys).to contain_exactly(*%w[id iid project_id sha ref status web_url created_at updated_at source]) + expect(json_response.first.keys).to contain_exactly(*%w[id iid project_id sha ref status web_url created_at updated_at source name]) + end + + context 'when pipeline_name_in_api feature flag is off' do + before do + stub_feature_flags(pipeline_name_in_api: false) + end + + it 'does not include pipeline name in response and ignores name parameter' do + get api("/projects/#{project.id}/pipelines", user), params: { name: 'Chatops pipeline' } + + expect(json_response.length).to eq(1) + expect(json_response.first.keys).not_to include('name') + end end end + it 'avoids N+1 queries' do + # Call to trigger any one time queries + get api("/projects/#{project.id}/pipelines", user), params: {} + + control = ActiveRecord::QueryRecorder.new(skip_cached: false) do + get api("/projects/#{project.id}/pipelines", user), params: {} + end + + 3.times do + create( + :ci_empty_pipeline, + project: project, + sha: project.commit.id, + ref: project.default_branch, + user: user, + name: 'Build pipeline') + end + + expect do + get api("/projects/#{project.id}/pipelines", user), params: {} + end.not_to exceed_all_query_limit(control) + end + context 'when parameter is passed' do %w[running pending].each do |target| context "when scope is #{target}" do @@ -303,6 +339,19 @@ RSpec.describe API::Ci::Pipelines, feature_category: :continuous_integration do end end end + + context 'when name is provided' do + let_it_be(:pipeline2) { create(:ci_empty_pipeline, project: project, user: user, name: 'Chatops pipeline') } + + it 'filters by name' do + get api("/projects/#{project.id}/pipelines", user), params: { name: 'Build pipeline' } + + expect(response).to have_gitlab_http_status(:ok) + expect(response).to include_pagination_headers + expect(json_response.length).to eq(1) + expect(json_response.first['name']).to eq('Build pipeline') + end + end end end diff --git a/spec/serializers/merge_request_poll_cached_widget_entity_spec.rb b/spec/serializers/merge_request_poll_cached_widget_entity_spec.rb index c81df90505d..458d9ecd916 100644 --- a/spec/serializers/merge_request_poll_cached_widget_entity_spec.rb +++ b/spec/serializers/merge_request_poll_cached_widget_entity_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe MergeRequestPollCachedWidgetEntity do +RSpec.describe MergeRequestPollCachedWidgetEntity, feature_category: :code_review_workflow do using RSpec::Parameterized::TableSyntax let_it_be(:project, refind: true) { create :project, :repository } @@ -331,4 +331,39 @@ RSpec.describe MergeRequestPollCachedWidgetEntity do end end end + + describe 'favicon overlay path' do + context 'when merged' do + before do + resource.mark_as_merged! + resource.metrics.update!(merged_by: user) + end + + it 'returns merged favicon overlay' do + expect(subject[:favicon_overlay_path]).to match_asset_path('/assets/mr_favicons/favicon_status_merged.png') + end + + context 'with pipeline' do + let_it_be(:pipeline) { create(:ci_empty_pipeline, project: project, ref: resource.source_branch, sha: resource.source_branch_sha, head_pipeline_of: resource) } + + it 'returns merged favicon overlay' do + expect(subject[:favicon_overlay_path]).to match_asset_path('/assets/mr_favicons/favicon_status_merged.png') + end + end + end + + context 'when not merged' do + it 'returns no favicon overlay' do + expect(subject[:favicon_overlay_path]).to be_nil + end + + context 'with pipeline' do + let_it_be(:pipeline) { create(:ci_empty_pipeline, project: project, ref: resource.source_branch, sha: resource.source_branch_sha, head_pipeline_of: resource) } + + it 'returns pipeline favicon overlay' do + expect(subject[:favicon_overlay_path]).to match_asset_path('/assets/ci_favicons/favicon_status_pending.png') + end + end + end + end end diff --git a/spec/services/ci/retry_job_service_spec.rb b/spec/services/ci/retry_job_service_spec.rb index 398aa674555..fed66bc535d 100644 --- a/spec/services/ci/retry_job_service_spec.rb +++ b/spec/services/ci/retry_job_service_spec.rb @@ -354,17 +354,7 @@ RSpec.describe Ci::RetryJobService, feature_category: :continuous_integration do include_context 'retryable build' - context 'when retry_job_start_pipeline_after_commit is enabled' do - it_behaves_like 'retries the job' - end - - context 'when retry_job_start_pipeline_after_commit is disabled' do - before do - stub_feature_flags(retry_job_start_pipeline_after_commit: false) - end - - it_behaves_like 'retries the job' - end + it_behaves_like 'retries the job' context 'automatic retryable build' do let!(:auto_retryable_build) do @@ -375,22 +365,9 @@ RSpec.describe Ci::RetryJobService, feature_category: :continuous_integration do auto_retryable_build.drop_with_exit_code!('test failure', 1) end - context 'when retry_job_start_pipeline_after_commit is enabled' do - it 'creates a new build and enqueues BuildQueueWorker' do - expect { drop_build! }.to change { Ci::Build.count }.by(1) - .and change { BuildQueueWorker.jobs.count }.by(1) - end - end - - context 'when retry_job_start_pipeline_after_commit is disabled' do - before do - stub_feature_flags(retry_job_start_pipeline_after_commit: false) - end - - it 'creates a new build but does not enqueue BuildQueueWorker' do - expect { drop_build! }.to change { Ci::Build.count }.by(1) - .and change { BuildQueueWorker.jobs.count }.by(0) - end + it 'creates a new build and enqueues BuildQueueWorker' do + expect { drop_build! }.to change { Ci::Build.count }.by(1) + .and change { BuildQueueWorker.jobs.count }.by(1) end end diff --git a/spec/support/rspec_order_todo.yml b/spec/support/rspec_order_todo.yml index 03c35e5774d..393f084ee97 100644 --- a/spec/support/rspec_order_todo.yml +++ b/spec/support/rspec_order_todo.yml @@ -494,7 +494,6 @@ - './ee/spec/features/trial_registrations/company_information_spec.rb' - './ee/spec/features/trial_registrations/signin_spec.rb' - './ee/spec/features/trial_registrations/signup_spec.rb' -- './ee/spec/features/trials/select_namespace_spec.rb' - './ee/spec/features/trials/show_trial_banner_spec.rb' - './ee/spec/features/users/arkose_labs_csp_spec.rb' - './ee/spec/features/users/login_spec.rb' |
