kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Add latest changes from gitlab-org/gitlab@master

This commit is contained in:
GitLab Bot 2022-10-25 21:09:20 +00:00
parent 0351d9ed83
commit 7625bc732c
68 changed files with 171 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/assets/javascripts/artifacts/components/artifact_row.vue
View File

@ -1,5 +1,5 @@
<script> <script>
import { GlButtonGroup, GlButton, GlBadge } from '@gitlab/ui'; import { GlButtonGroup, GlButton, GlBadge, GlFriendlyWrap } from '@gitlab/ui';
import { numberToHumanSize } from '~/lib/utils/number_utils'; import { numberToHumanSize } from '~/lib/utils/number_utils';
import { I18N_EXPIRED, I18N_DOWNLOAD, I18N_DELETE } from '../constants'; import { I18N_EXPIRED, I18N_DOWNLOAD, I18N_DELETE } from '../constants';
@ -9,6 +9,7 @@ export default {
GlButtonGroup, GlButtonGroup,
GlButton, GlButton,
GlBadge, GlBadge,
GlFriendlyWrap,
}, },
props: { props: {
artifact: { artifact: {
@ -48,8 +49,11 @@ export default {
:class="{ 'gl-border-b-solid gl-border-b-1 gl-border-gray-100': !isLastRow }" :class="{ 'gl-border-b-solid gl-border-b-1 gl-border-gray-100': !isLastRow }"
> >
<div class="gl-display-inline-flex gl-align-items-center gl-w-full"> <div class="gl-display-inline-flex gl-align-items-center gl-w-full">
<span class="gl-w-half gl-pl-8 gl-display-flex" data-testid="job-artifact-row-name"> <span
{{ artifact.name }} class="gl-w-half gl-pl-8 gl-display-flex gl-align-items-center"
data-testid="job-artifact-row-name"
>
<gl-friendly-wrap :text="artifact.name" />
<gl-badge size="sm" variant="neutral" class="gl-ml-2"> <gl-badge size="sm" variant="neutral" class="gl-ml-2">
{{ artifact.fileType.toLowerCase() }} {{ artifact.fileType.toLowerCase() }}
</gl-badge> </gl-badge>

2
db/docs/approval_merge_request_rule_sources.yml
View File

@ -4,6 +4,6 @@ classes:
- ApprovalMergeRequestRuleSource - ApprovalMergeRequestRuleSource
feature_categories: feature_categories:
- source_code_management - source_code_management
description: TODO description: Keeps connection between merge request and project approval rule
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/8497 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/8497
milestone: '11.7' milestone: '11.7'

2
db/docs/approval_merge_request_rules.yml
View File

@ -4,6 +4,6 @@ classes:
- ApprovalMergeRequestRule - ApprovalMergeRequestRule
feature_categories: feature_categories:
- source_code_management - source_code_management
description: TODO description: Keeps approval merge request rules
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/8497 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/8497
milestone: '11.7' milestone: '11.7'

2
db/docs/approval_merge_request_rules_groups.yml
View File

@ -3,6 +3,6 @@ table_name: approval_merge_request_rules_groups
classes: [] classes: []
feature_categories: feature_categories:
- source_code_management - source_code_management
description: TODO description: Keeps connection between group and a merge request approval rule
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/8497 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/8497
milestone: '11.7' milestone: '11.7'

2
db/docs/approval_merge_request_rules_users.yml
View File

@ -3,6 +3,6 @@ table_name: approval_merge_request_rules_users
classes: [] classes: []
feature_categories: feature_categories:
- source_code_management - source_code_management
description: TODO description: Keeps connection between user and a merge request approval rule
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/8497 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/8497
milestone: '11.7' milestone: '11.7'

2
db/docs/approval_project_rules.yml
View File

@ -4,6 +4,6 @@ classes:
- ApprovalProjectRule - ApprovalProjectRule
feature_categories: feature_categories:
- source_code_management - source_code_management
description: TODO description: Keeps approval project rules
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/8497 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/8497
milestone: '11.7' milestone: '11.7'

2
db/docs/approval_project_rules_groups.yml
View File

@ -3,6 +3,6 @@ table_name: approval_project_rules_groups
classes: [] classes: []
feature_categories: feature_categories:
- source_code_management - source_code_management
description: TODO description: Keeps connection between group and a project approval rule
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/8497 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/8497
milestone: '11.7' milestone: '11.7'

2
db/docs/approval_project_rules_protected_branches.yml
View File

@ -4,6 +4,6 @@ classes:
- ApprovalProjectRulesProtectedBranch - ApprovalProjectRulesProtectedBranch
feature_categories: feature_categories:
- source_code_management - source_code_management
description: TODO description: Keeps relation between approval project rules and protected branches.
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/22673 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/22673
milestone: '12.7' milestone: '12.7'

2
db/docs/approval_project_rules_users.yml
View File

@ -3,6 +3,6 @@ table_name: approval_project_rules_users
classes: [] classes: []
feature_categories: feature_categories:
- source_code_management - source_code_management
description: TODO description: Keeps connection between user and a project approval rule
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/8497 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/8497
milestone: '11.7' milestone: '11.7'

2
db/docs/approvals.yml
View File

@ -4,6 +4,6 @@ classes:
- Approval - Approval
feature_categories: feature_categories:
- source_code_management - source_code_management
description: TODO description: Stores merge request approvals made by users
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/73faf3c7289c4fa4535b752a12247ee74b173976 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/73faf3c7289c4fa4535b752a12247ee74b173976
milestone: '7.12' milestone: '7.12'

5
db/docs/approver_groups.yml
View File

@ -3,7 +3,8 @@ table_name: approver_groups
classes: classes:
- ApproverGroup - ApproverGroup
feature_categories: feature_categories:
- code_review
- source_code_management - source_code_management
description: TODO description: Group approvers of given merge request
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/21d27185191e6204a6645d776c77ae3855cce3e8 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/743
milestone: '8.13' milestone: '8.13'

1
db/docs/approvers.yml
View File

@ -4,6 +4,7 @@ classes:
- Approver - Approver
feature_categories: feature_categories:
- code_review - code_review
- source_code_management
description: Approvers of given merge request description: Approvers of given merge request
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/3cc78d89984d9c9df8372c52b7bba38e6226f9f2 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/3cc78d89984d9c9df8372c52b7bba38e6226f9f2
milestone: '7.13' milestone: '7.13'

2
db/docs/ci_build_report_results.yml
View File

@ -4,6 +4,6 @@ classes:
- Ci::BuildReportResult - Ci::BuildReportResult
feature_categories: feature_categories:
- code_testing - code_testing
description: TODO description: Stores data related to the build that finished, including junit test data.
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/32991 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/32991
milestone: '13.1' milestone: '13.1'

2
db/docs/ci_daily_build_group_report_results.yml
View File

@ -4,6 +4,6 @@ classes:
- Ci::DailyBuildGroupReportResult - Ci::DailyBuildGroupReportResult
feature_categories: feature_categories:
- code_testing - code_testing
description: TODO description: Stores daily aggregated data related to the build group, including code coverage data.
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/30387 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/30387
milestone: '13.0' milestone: '13.0'

2
db/docs/ci_deleted_objects.yml
View File

@ -4,6 +4,6 @@ classes:
- Ci::DeletedObject - Ci::DeletedObject
feature_categories: feature_categories:
- build_artifacts - build_artifacts
description: TODO description: Allows efficient batch deletion of data in object storage.
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/9bf76fe03f8edf4f67023448161af27abb8fb521 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/9bf76fe03f8edf4f67023448161af27abb8fb521
milestone: '13.5' milestone: '13.5'

2
db/docs/ci_job_artifacts.yml
View File

@ -5,6 +5,6 @@ classes:
- Gitlab::Ci::JobArtifact - Gitlab::Ci::JobArtifact
feature_categories: feature_categories:
- build_artifacts - build_artifacts
description: TODO description: Stores artifacts produced by a build.
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/61864a5a5bb523953589c9398a431c4369fbfc76 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/61864a5a5bb523953589c9398a431c4369fbfc76
milestone: '10.3' milestone: '10.3'

2
db/docs/ci_pipeline_artifacts.yml
View File

@ -4,6 +4,6 @@ classes:
- Ci::PipelineArtifact - Ci::PipelineArtifact
feature_categories: feature_categories:
- build_artifacts - build_artifacts
description: TODO description: Stores aggregated artifacts produced by a pipeline.
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/37969 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/37969
milestone: '13.3' milestone: '13.3'

2
db/docs/ci_unit_test_failures.yml
View File

@ -4,6 +4,6 @@ classes:
- Ci::UnitTestFailure - Ci::UnitTestFailure
feature_categories: feature_categories:
- code_testing - code_testing
description: TODO description: Stores unit test failure data produced from builds.
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56137 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56137
milestone: '13.11' milestone: '13.11'

2
db/docs/ci_unit_tests.yml
View File

@ -4,6 +4,6 @@ classes:
- Ci::UnitTest - Ci::UnitTest
feature_categories: feature_categories:
- code_testing - code_testing
description: TODO description: Stores unit test data produced from builds.
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56137 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56137
milestone: '13.11' milestone: '13.11'

2
db/docs/content_blocked_states.yml
View File

@ -3,6 +3,6 @@ table_name: content_blocked_states
classes: [] classes: []
feature_categories: feature_categories:
- source_code_management - source_code_management
description: TODO description: JiHu only. Keeps list of restricted blobs.
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/72124 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/72124
milestone: '14.5' milestone: '14.5'

2
db/docs/diff_note_positions.yml
View File

@ -4,6 +4,6 @@ classes:
- DiffNotePosition - DiffNotePosition
feature_categories: feature_categories:
- source_code_management - source_code_management
description: TODO description: Stores diff notes positions
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/28113 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/28113
milestone: '13.0' milestone: '13.0'

4
db/docs/external_approval_rules_protected_branches.yml
View File

@ -2,7 +2,7 @@
table_name: external_approval_rules_protected_branches table_name: external_approval_rules_protected_branches
classes: [] classes: []
feature_categories: feature_categories:
- source_code_management - compliance_management
description: TODO description: Keeps relation between protected branches and external approval rules
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54002 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54002
milestone: '13.10' milestone: '13.10'

4
db/docs/external_status_checks.yml
View File

@ -3,7 +3,7 @@ table_name: external_status_checks
classes: classes:
- MergeRequests::ExternalStatusCheck - MergeRequests::ExternalStatusCheck
feature_categories: feature_categories:
- source_code_management - compliance_management
description: TODO description: Stores project's external status checks
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/62186 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/62186
milestone: '14.0' milestone: '14.0'

4
db/docs/external_status_checks_protected_branches.yml
View File

@ -2,7 +2,7 @@
table_name: external_status_checks_protected_branches table_name: external_status_checks_protected_branches
classes: [] classes: []
feature_categories: feature_categories:
- source_code_management - compliance_management
description: TODO description: Keeps relation between protected branches and external status checks
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/62186 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/62186
milestone: '14.0' milestone: '14.0'

4
db/docs/fork_network_members.yml
View File

@ -4,6 +4,6 @@ classes:
- ForkNetworkMember - ForkNetworkMember
feature_categories: feature_categories:
- source_code_management - source_code_management
description: TODO description: Keeps track of fork relations between projects.
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/3098 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/62186
milestone: '10.1' milestone: '10.1'

4
db/docs/gpg_key_subkeys.yml
View File

@ -4,6 +4,6 @@ classes:
- GpgKeySubkey - GpgKeySubkey
feature_categories: feature_categories:
- source_code_management - source_code_management
description: TODO description: Stores GPG subkeys
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/3098 introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/14517
milestone: '10.1' milestone: '10.1'

4
db/docs/gpg_keys.yml
View File

@ -4,6 +4,6 @@ classes:
- GpgKey - GpgKey
feature_categories: feature_categories:
- source_code_management - source_code_management
description: TODO description: Stores GPG keys
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/fbf1fd1a204a24aef2b80473ec64a520ed2a2dfc introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/9546
milestone: '9.5' milestone: '9.5'

4
db/docs/gpg_signatures.yml
View File

@ -4,6 +4,6 @@ classes:
- CommitSignatures::GpgSignature - CommitSignatures::GpgSignature
feature_categories: feature_categories:
- source_code_management - source_code_management
description: TODO description: Stores GPG signatures
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/8236b12dff3df6d223888664c820ae54b4e0eaf7 introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/9546
milestone: '9.5' milestone: '9.5'

2
db/docs/group_merge_request_approval_settings.yml
View File

@ -4,6 +4,6 @@ classes:
- GroupMergeRequestApprovalSetting - GroupMergeRequestApprovalSetting
feature_categories: feature_categories:
- source_code_management - source_code_management
description: TODO description: Keeps merge request approval settings per group
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/50256 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/50256
milestone: '13.8' milestone: '13.8'

6
db/docs/merge_request_blocks.yml
View File

@ -4,6 +4,6 @@ classes:
- MergeRequestBlock - MergeRequestBlock
feature_categories: feature_categories:
- source_code_management - source_code_management
description: TODO description: Keeps relation between blocked and blocking merge requests
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/df778038981ae49cb7c0fec0a60f89abf801c5f0 introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/27323
milestone: '12.0' milestone: '11.11'

4
db/docs/merge_request_context_commit_diff_files.yml
View File

@ -3,7 +3,7 @@ table_name: merge_request_context_commit_diff_files
classes: classes:
- MergeRequestContextCommitDiffFile - MergeRequestContextCommitDiffFile
feature_categories: feature_categories:
- source_code_management - code_review
description: TODO description: Stores diffs data for merge request context commits
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/23701 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/23701
milestone: '12.8' milestone: '12.8'

6
db/docs/namespace_aggregation_schedules.yml
View File

@ -3,7 +3,7 @@ table_name: namespace_aggregation_schedules
classes: classes:
- Namespace::AggregationSchedule - Namespace::AggregationSchedule
feature_categories: feature_categories:
- source_code_management - utilization
description: TODO description: Keeps update schedules for namespace_root_storage_statistics
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/bde41ee866d0fe0b1bb5ece1130fb6e24d95ad17 introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/29570
milestone: '12.1' milestone: '12.1'

2
db/docs/path_locks.yml
View File

@ -4,6 +4,6 @@ classes:
- PathLock - PathLock
feature_categories: feature_categories:
- source_code_management - source_code_management
description: TODO description: Stores paths to repository blobs locked by users
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/684e9d1b5979e11d2edae11a3028a696bfcdedf8 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/684e9d1b5979e11d2edae11a3028a696bfcdedf8
milestone: '8.9' milestone: '8.9'

2
db/docs/project_aliases.yml
View File

@ -4,6 +4,6 @@ classes:
- ProjectAlias - ProjectAlias
feature_categories: feature_categories:
- source_code_management - source_code_management
description: TODO description: Stores aliases of projects
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/14108 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/14108
milestone: '12.1' milestone: '12.1'

2
db/docs/project_build_artifacts_size_refreshes.yml
View File

@ -4,6 +4,6 @@ classes:
- Projects::BuildArtifactsSizeRefresh - Projects::BuildArtifactsSizeRefresh
feature_categories: feature_categories:
- build_artifacts - build_artifacts
description: TODO description: Temporary table to accurately recompute artifacts size.
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81306 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81306
milestone: '14.9' milestone: '14.9'

2
db/docs/project_ci_feature_usages.yml
View File

@ -4,6 +4,6 @@ classes:
- Projects::CiFeatureUsage - Projects::CiFeatureUsage
feature_categories: feature_categories:
- code_testing - code_testing
description: Project CI feature usage information description: Project CI feature usage information used to access CI data from the main database.
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/68186 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/68186
milestone: '14.2' milestone: '14.2'

4
db/docs/project_daily_statistics.yml
View File

@ -4,6 +4,6 @@ classes:
- ProjectDailyStatistic - ProjectDailyStatistic
feature_categories: feature_categories:
- source_code_management - source_code_management
description: TODO description: Stores repository fetch statistics per day
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/5ae9a44aa17c8929627cc450f936cd960c143e25 introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/23596
milestone: '11.9' milestone: '11.9'

2
db/docs/project_repositories.yml
View File

@ -4,6 +4,6 @@ classes:
- ProjectRepository - ProjectRepository
feature_categories: feature_categories:
- source_code_management - source_code_management
description: TODO description: Keeps disk path to repositories and link to the shard
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/8614 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/8614
milestone: '11.6' milestone: '11.6'

4
db/docs/project_repository_states.yml
View File

@ -3,7 +3,7 @@ table_name: project_repository_states
classes: classes:
- ProjectRepositoryState - ProjectRepositoryState
feature_categories: feature_categories:
- source_code_management - geo_replication
description: TODO description: Keeps checksums of repositories
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/4428 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/4428
milestone: '10.6' milestone: '10.6'

4
db/docs/project_repository_storage_moves.yml
View File

@ -3,7 +3,7 @@ table_name: project_repository_storage_moves
classes: classes:
- Projects::RepositoryStorageMove - Projects::RepositoryStorageMove
feature_categories: feature_categories:
- source_code_management - gitaly
description: TODO description: Stores status of project repository moves
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/29095 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/29095
milestone: '13.0' milestone: '13.0'

2
db/docs/protected_branch_merge_access_levels.yml
View File

@ -4,6 +4,6 @@ classes:
- ProtectedBranch::MergeAccessLevel - ProtectedBranch::MergeAccessLevel
feature_categories: feature_categories:
- source_code_management - source_code_management
description: TODO description: Stores merge access settings for protected branches
introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/5081 introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/5081
milestone: '8.11' milestone: '8.11'

2
db/docs/protected_branch_push_access_levels.yml
View File

@ -4,6 +4,6 @@ classes:
- ProtectedBranch::PushAccessLevel - ProtectedBranch::PushAccessLevel
feature_categories: feature_categories:
- source_code_management - source_code_management
description: TODO description: Stores push access settings for protected branches
introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/5081 introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/5081
milestone: '8.11' milestone: '8.11'

2
db/docs/protected_branch_unprotect_access_levels.yml
View File

@ -4,6 +4,6 @@ classes:
- ProtectedBranch::UnprotectAccessLevel - ProtectedBranch::UnprotectAccessLevel
feature_categories: feature_categories:
- source_code_management - source_code_management
description: TODO description: Stores access settings for protected branch unprotection
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/5103 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/5103
milestone: '10.7' milestone: '10.7'

2
db/docs/protected_branches.yml
View File

@ -5,6 +5,6 @@ classes:
- ProtectedBranch - ProtectedBranch
feature_categories: feature_categories:
- source_code_management - source_code_management
description: TODO description: Keeps a list of protected branches by project
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/37224dc9c1ee80ba9030b616e2bc87bd96919e09 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/37224dc9c1ee80ba9030b616e2bc87bd96919e09
milestone: "<6.0" milestone: "<6.0"

2
db/docs/protected_tag_create_access_levels.yml
View File

@ -4,6 +4,6 @@ classes:
- ProtectedTag::CreateAccessLevel - ProtectedTag::CreateAccessLevel
feature_categories: feature_categories:
- source_code_management - source_code_management
description: TODO description: Stores create access settings for protected tags
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/07d7d8e65905a39164b63f55eccdcea8f10f5d14 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/07d7d8e65905a39164b63f55eccdcea8f10f5d14
milestone: '9.1' milestone: '9.1'

4
db/docs/protected_tags.yml
View File

@ -4,6 +4,6 @@ classes:
- ProtectedTag - ProtectedTag
feature_categories: feature_categories:
- source_code_management - source_code_management
description: TODO description: Keeps a list of protected tags by project
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/1a416a42f1c1b876ecd96687e41696bc915cc2c2 introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/10356
milestone: '9.1' milestone: '9.1'

6
db/docs/push_event_payloads.yml
View File

@ -3,7 +3,7 @@ table_name: push_event_payloads
classes: classes:
- PushEventPayload - PushEventPayload
feature_categories: feature_categories:
- source_code_management - users
description: TODO description: Stores log of push events
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/0395c47193b3bbf6b4f060f28c9f632580313a35 introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/12463
milestone: '9.5' milestone: '9.5'

4
db/docs/remote_mirrors.yml
View File

@ -4,6 +4,6 @@ classes:
- RemoteMirror - RemoteMirror
feature_categories: feature_categories:
- source_code_management - source_code_management
description: TODO description: Stores push mirrors and their update statuses
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/ab83917c25c5d1f7dd29c82c91c699008292bc1d introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/249
milestone: '8.7' milestone: '8.7'

4
db/docs/repository_languages.yml
View File

@ -4,6 +4,6 @@ classes:
- RepositoryLanguage - RepositoryLanguage
feature_categories: feature_categories:
- source_code_management - source_code_management
description: TODO description: Keeps relation between projects and repository languages
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/79a5d76801a45696db629e1f543f2e1d6fa4784f introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/19480
milestone: '11.2' milestone: '11.2'

2
db/docs/required_code_owners_sections.yml
View File

@ -4,6 +4,6 @@ classes:
- ProtectedBranch::RequiredCodeOwnersSection - ProtectedBranch::RequiredCodeOwnersSection
feature_categories: feature_categories:
- source_code_management - source_code_management
description: TODO description: Keeps required code owners sections
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/43573 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/43573
milestone: '13.5' milestone: '13.5'

4
db/docs/trending_projects.yml
View File

@ -4,6 +4,6 @@ classes:
- TrendingProject - TrendingProject
feature_categories: feature_categories:
- source_code_management - source_code_management
description: TODO description: Stores the list of trending projects
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/237c8f66e6608420629503280aaea555ee980022 introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/6749
milestone: '8.13' milestone: '8.13'

2
db/docs/x509_certificates.yml
View File

@ -4,6 +4,6 @@ classes:
- X509Certificate - X509Certificate
feature_categories: feature_categories:
- source_code_management - source_code_management
description: TODO description: Stores data about X.509 certificate
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/17773 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/17773
milestone: '12.8' milestone: '12.8'

2
db/docs/x509_commit_signatures.yml
View File

@ -4,6 +4,6 @@ classes:
- CommitSignatures::X509CommitSignature - CommitSignatures::X509CommitSignature
feature_categories: feature_categories:
- source_code_management - source_code_management
description: TODO description: Stores X.509 verification status of the commit
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/17773 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/17773
milestone: '12.8' milestone: '12.8'

2
db/docs/x509_issuers.yml
View File

@ -4,6 +4,6 @@ classes:
- X509Issuer - X509Issuer
feature_categories: feature_categories:
- source_code_management - source_code_management
description: TODO description: Stores data about issuer of X.509 certificate
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/17773 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/17773
milestone: '12.8' milestone: '12.8'

6
doc/administration/geo/replication/troubleshooting.md
View File

@ -317,7 +317,8 @@ sudo gitlab-rake gitlab:geo:check
to gather the following, basic troubleshooting information. to gather the following, basic troubleshooting information.
WARNING: WARNING:
Any command that changes data directly could be damaging if not run correctly, or under the right conditions. We highly recommend running them in a test environment with a backup of the instance ready to be restored, just in case.
Commands that change data can cause damage if not run correctly or under the right conditions. Always run commands in a test environment first and have a backup instance ready to restore.
#### Get the number of verification failed repositories #### Get the number of verification failed repositories
@ -854,7 +855,8 @@ therefore short-circuited. `last_sync_failure` is now set to `The file is missin
examples, but things generally work the same for the other types. examples, but things generally work the same for the other types.
WARNING: WARNING:
Any command that changes data directly could be damaging if not run correctly, or under the right conditions. We highly recommend running them in a test environment with a backup of the instance ready to be restored, just in case.
Commands that change data can cause damage if not run correctly or under the right conditions. Always run commands in a test environment first and have a backup instance ready to restore.
#### The Replicator #### The Replicator

3
doc/administration/operations/rails_console.md
View File

@ -736,7 +736,8 @@ ApplicationSetting.current
### Open object in `irb` ### Open object in `irb`
WARNING: WARNING:
Any command that changes data directly could be damaging if not run correctly, or under the right conditions. We highly recommend running them in a test environment with a backup of the instance ready to be restored, just in case.
Commands that change data can cause damage if not run correctly or under the right conditions. Always run commands in a test environment first and have a backup instance ready to restore.
Sometimes it is easier to go through a method if you are in the context of the object. You can shim into the namespace of `Object` to let you open `irb` in the context of any object: Sometimes it is easier to go through a method if you are in the context of the object. You can shim into the namespace of `Object` to let you open `irb` in the context of any object:

2
doc/api/deploy_tokens.md
View File

@ -222,7 +222,7 @@ Parameters:
| Attribute | Type | Required | Description | | Attribute | Type | Required | Description |
|:---------------|:---------------|:-----------------------|:------------| |:---------------|:---------------|:-----------------------|:------------|
| `id` | integer/string | **{check-circle}** Yes | ID or [URL-encoded path of the project](index.md#namespaced-path-encoding). | | `id` | integer/string | **{check-circle}** Yes | ID or [URL-encoded path of the group](index.md#namespaced-path-encoding). |
| `active` | boolean | **{dotted-circle}** No | Limit by active status. | | `active` | boolean | **{dotted-circle}** No | Limit by active status. |
Example request: Example request:

2
doc/development/ee_features.md
View File

@ -130,7 +130,7 @@ export GITLAB_SIMULATE_SAAS=1
There are many ways to pass an environment variable to your local GitLab instance. There are many ways to pass an environment variable to your local GitLab instance.
For example, you can create a `env.runit` file in the root of your GDK with the above snippet. For example, you can create a `env.runit` file in the root of your GDK with the above snippet.
#### Allow use of licensed EE feature #### Enable plans per namespace
To enable plans per namespace turn on the `Allow use of licensed EE features` option from the settings page. To enable plans per namespace turn on the `Allow use of licensed EE features` option from the settings page.
This will make licensed EE features available to projects only if the project namespace's plan includes the feature This will make licensed EE features available to projects only if the project namespace's plan includes the feature

6
doc/user/group/manage.md
View File

@ -816,7 +816,8 @@ Group.find_by_sql("SELECT * FROM namespaces WHERE name LIKE '%oup'")
If transferring a group doesn't work through the UI or API, you may want to attempt the transfer in a [Rails console session](../../administration/operations/rails_console.md#starting-a-rails-console-session): If transferring a group doesn't work through the UI or API, you may want to attempt the transfer in a [Rails console session](../../administration/operations/rails_console.md#starting-a-rails-console-session):
WARNING: WARNING:
Any command that changes data directly could be damaging if not run correctly, or under the right conditions. We highly recommend running them in a test environment with a backup of the instance ready to be restored, just in case.
Commands that change data can cause damage if not run correctly or under the right conditions. Always run commands in a test environment first and have a backup instance ready to restore.
```ruby ```ruby
user = User.find_by_username('<username>') user = User.find_by_username('<username>')
@ -847,7 +848,8 @@ At times, a group deletion may get stuck. If needed, in a [Rails console session
you can attempt to delete a group using the following command: you can attempt to delete a group using the following command:
WARNING: WARNING:
Any command that changes data directly could be damaging if not run correctly, or under the right conditions. We highly recommend running them in a test environment with a backup of the instance ready to be restored, just in case.
Commands that change data can cause damage if not run correctly or under the right conditions. Always run commands in a test environment first and have a backup instance ready to restore.
```ruby ```ruby
GroupDestroyWorker.new.perform(group_id, user_id) GroupDestroyWorker.new.perform(group_id, user_id)

8
doc/user/packages/terraform_module_registry/index.md
View File

@ -24,9 +24,11 @@ When you publish a Terraform Module, if it does not exist, it is created.
Prerequisites: Prerequisites:
- A package with the same name and version must not already exist in the top-level namespace. - The package name and version [must be unique in the top-level namespace](../infrastructure_registry/index.md#how-module-resolution-works).
- Your project and group names must not include a dot (`.`). For example, `source = "gitlab.example.com/my.group/project.name"`. - Your project and group names must not include a dot (`.`). For example, `source = "gitlab.example.com/my.group/project.name"`.
- You must [authenticate with the API](../../../api/index.md#authentication). If authenticating with a deploy token, it must be configured with the `write_package_registry` scope. - You must [authenticate with the API](../../../api/index.md#authentication). If authenticating with a deploy token, it must be configured with the `write_package_registry` scope.
- The name of a module [must be unique within the scope of its group](../infrastructure_registry/index.md#how-module-resolution-works), otherwise an
[error occurs](#troubleshooting).
```plaintext ```plaintext
PUT /projects/:id/packages/terraform/modules/:module-name/:module-system/:module-version/file PUT /projects/:id/packages/terraform/modules/:module-name/:module-system/:module-version/file
@ -141,3 +143,7 @@ For examples of the Terraform module registry, check the projects below:
- The [_GitLab local file_ project](https://gitlab.com/mattkasa/gitlab-local-file) creates a minimal Terraform module and uploads it into the Terraform module registry using GitLab CI/CD. - The [_GitLab local file_ project](https://gitlab.com/mattkasa/gitlab-local-file) creates a minimal Terraform module and uploads it into the Terraform module registry using GitLab CI/CD.
- The [_Terraform module test_ project](https://gitlab.com/mattkasa/terraform-module-test) uses the module from the previous example. - The [_Terraform module test_ project](https://gitlab.com/mattkasa/terraform-module-test) uses the module from the previous example.
## Troubleshooting
- Publishing a module with a duplicate name results in a `{"message":"Access Denied"}` error. There's an ongoing discussion about allowing duplicate module names [in this issue](https://gitlab.com/gitlab-org/gitlab/-/issues/368040).

3
doc/user/project/integrations/slack.md
View File

@ -134,7 +134,8 @@ To disable notifications for all projects that have Slack integration enabled,
[start a rails console session](../../../administration/operations/rails_console.md#starting-a-rails-console-session) and use a script similar to the following: [start a rails console session](../../../administration/operations/rails_console.md#starting-a-rails-console-session) and use a script similar to the following:
WARNING: WARNING:
Any command that changes data directly could be damaging if not run correctly, or under the right conditions. We highly recommend running them in a test environment with a backup of the instance ready to be restored, just in case.
Commands that change data can cause damage if not run correctly or under the right conditions. Always run commands in a test environment first and have a backup instance ready to restore.
```ruby ```ruby
# Grab all projects that have the Slack notifications enabled # Grab all projects that have the Slack notifications enabled

3
doc/user/project/repository/mirror/index.md
View File

@ -326,7 +326,8 @@ repository mirroring, mirroring breaks when people leave the company. Use this
script to migrate disparate mirroring users and tokens into a single service account: script to migrate disparate mirroring users and tokens into a single service account:
WARNING: WARNING:
Any command that changes data directly could be damaging if not run correctly, or under the right conditions. We highly recommend running them in a test environment with a backup of the instance ready to be restored, just in case.
Commands that change data can cause damage if not run correctly or under the right conditions. Always run commands in a test environment first and have a backup instance ready to restore.
```ruby ```ruby
svc_user = User.find_by(username: 'ourServiceUser') svc_user = User.find_by(username: 'ourServiceUser')

3
doc/user/project/repository/push_rules.md
View File

@ -304,7 +304,8 @@ For example, to enable **Check whether the commit author is a GitLab user** and
and create a filter for allowing commits from a specific email domain only through rails console: and create a filter for allowing commits from a specific email domain only through rails console:
WARNING: WARNING:
Any command that changes data directly could be damaging if not run correctly, or under the right conditions. We highly recommend running them in a test environment with a backup of the instance ready to be restored, just in case.
Commands that change data can cause damage if not run correctly or under the right conditions. Always run commands in a test environment first and have a backup instance ready to restore.
``` ruby ``` ruby
Project.find_each do |p| Project.find_each do |p|

9
doc/user/project/working_with_projects.md
View File

@ -516,7 +516,8 @@ If a project or repository has been updated but the state is not reflected in th
You can do so through [a Rails console session](../../administration/operations/rails_console.md#starting-a-rails-console-session) and one of the following: You can do so through [a Rails console session](../../administration/operations/rails_console.md#starting-a-rails-console-session) and one of the following:
WARNING: WARNING:
Any command that changes data directly could be damaging if not run correctly, or under the right conditions. We highly recommend running them in a test environment with a backup of the instance ready to be restored, just in case.
Commands that change data can cause damage if not run correctly or under the right conditions. Always run commands in a test environment first and have a backup instance ready to restore.
```ruby ```ruby
## Clear project cache ## Clear project cache
@ -545,7 +546,8 @@ end
If a project cannot be deleted, you can attempt to delete it through [Rails console](../../administration/operations/rails_console.md#starting-a-rails-console-session). If a project cannot be deleted, you can attempt to delete it through [Rails console](../../administration/operations/rails_console.md#starting-a-rails-console-session).
WARNING: WARNING:
Any command that changes data directly could be damaging if not run correctly, or under the right conditions. We highly recommend running them in a test environment with a backup of the instance ready to be restored, just in case.
Commands that change data can cause damage if not run correctly or under the right conditions. Always run commands in a test environment first and have a backup instance ready to restore.
```ruby ```ruby
project = Project.find_by_full_path('<project_path>') project = Project.find_by_full_path('<project_path>')
@ -569,7 +571,8 @@ To toggle a specific feature, you can [start a Rails console session](../../admi
and run the following function: and run the following function:
WARNING: WARNING:
Any command that changes data directly could be damaging if not run correctly, or under the right conditions. We highly recommend running them in a test environment with a backup of the instance ready to be restored, just in case.
Commands that change data can cause damage if not run correctly or under the right conditions. Always run commands in a test environment first and have a backup instance ready to restore.
```ruby ```ruby
projects = Group.find_by_name('_group_name').projects projects = Group.find_by_name('_group_name').projects

93
lib/api/discussions.rb
View File

@ -18,17 +18,19 @@ module API
Helpers::DiscussionsHelpers.feature_category_per_noteable_type.each do |noteable_type, feature_category| Helpers::DiscussionsHelpers.feature_category_per_noteable_type.each do |noteable_type, feature_category|
parent_type = noteable_type.parent_class.to_s.underscore parent_type = noteable_type.parent_class.to_s.underscore
noteables_str = noteable_type.to_s.underscore.pluralize noteables_str = noteable_type.to_s.underscore.pluralize
notable_name = noteable_type.to_s.underscore.humanize.downcase
notable_id_type = noteable_type == Commit ? String : Integer
noteables_path = noteable_type == Commit ? "repository/#{noteables_str}" : noteables_str noteables_path = noteable_type == Commit ? "repository/#{noteables_str}" : noteables_str
params do params do
requires :id, type: String, desc: "The ID of a #{parent_type}" requires :id, type: String, desc: "The ID of a #{parent_type}"
end end
resource parent_type.pluralize.to_sym, requirements: API::NAMESPACE_OR_PROJECT_REQUIREMENTS do resource parent_type.pluralize.to_sym, requirements: API::NAMESPACE_OR_PROJECT_REQUIREMENTS do
desc "Get a list of #{noteable_type.to_s.downcase} discussions" do desc "Get a list of #{notable_name} discussions" do
success Entities::Discussion success Entities::Discussion
end end
params do params do
requires :noteable_id, types: [Integer, String], desc: 'The ID of the noteable' requires :noteable_id, type: notable_id_type, desc: "The ID of the #{notable_name}"
use :pagination use :pagination
end end
@ -41,12 +43,12 @@ module API
present Discussion.build_collection(notes, noteable), with: Entities::Discussion present Discussion.build_collection(notes, noteable), with: Entities::Discussion
end end
desc "Get a single #{noteable_type.to_s.downcase} discussion" do desc "Get a single #{notable_name} discussion" do
success Entities::Discussion success Entities::Discussion
end end
params do params do
requires :discussion_id, type: String, desc: 'The ID of a discussion' requires :discussion_id, type: String, desc: 'The ID of a discussion'
requires :noteable_id, types: [Integer, String], desc: 'The ID of the noteable' requires :noteable_id, type: notable_id_type, desc: "The ID of the #{notable_name}"
end end
get ":id/#{noteables_path}/:noteable_id/discussions/:discussion_id", feature_category: feature_category do get ":id/#{noteables_path}/:noteable_id/discussions/:discussion_id", feature_category: feature_category do
noteable = find_noteable(noteable_type, params[:noteable_id]) noteable = find_noteable(noteable_type, params[:noteable_id])
@ -61,39 +63,44 @@ module API
present discussion, with: Entities::Discussion present discussion, with: Entities::Discussion
end end
desc "Create a new #{noteable_type.to_s.downcase} discussion" do desc "Create a new #{notable_name} discussion" do
success Entities::Discussion success Entities::Discussion
end end
params do params do
requires :noteable_id, types: [Integer, String], desc: 'The ID of the noteable' requires :noteable_id, type: notable_id_type, desc: "The ID of the #{notable_name}"
requires :body, type: String, desc: 'The content of a note' requires :body, type: String, desc: 'The content of a note'
optional :created_at, type: String, desc: 'The creation date of the note' optional :created_at, type: String, desc: 'The creation date of the note'
optional :position, type: Hash do
requires :base_sha, type: String, desc: 'Base commit SHA in the source branch'
requires :start_sha, type: String, desc: 'SHA referencing commit in target branch'
requires :head_sha, type: String, desc: 'SHA referencing HEAD of this merge request'
requires :position_type, type: String, desc: 'Type of the position reference', values: %w(text image)
optional :new_path, type: String, desc: 'File path after change'
optional :new_line, type: Integer, desc: 'Line number after change'
optional :old_path, type: String, desc: 'File path before change'
optional :old_line, type: Integer, desc: 'Line number before change'
optional :width, type: Integer, desc: 'Width of the image'
optional :height, type: Integer, desc: 'Height of the image'
optional :x, type: Integer, desc: 'X coordinate in the image'
optional :y, type: Integer, desc: 'Y coordinate in the image'
optional :line_range, type: Hash, desc: 'Multi-line start and end' do if [Commit, MergeRequest].include?(noteable_type)
optional :start, type: Hash do optional :position, type: Hash do
optional :line_code, type: String, desc: 'Start line code for multi-line note' requires :base_sha, type: String, desc: 'Base commit SHA in the source branch'
optional :type, type: String, desc: 'Start line type for multi-line note' requires :start_sha, type: String, desc: 'SHA referencing commit in target branch'
optional :old_line, type: String, desc: 'Start old_line line number' requires :head_sha, type: String, desc: 'SHA referencing HEAD of this merge request'
optional :new_line, type: String, desc: 'Start new_line line number' requires :position_type, type: String, desc: 'Type of the position reference', values: %w(text image)
end optional :new_path, type: String, desc: 'File path after change'
optional :end, type: Hash do optional :new_line, type: Integer, desc: 'Line number after change'
optional :line_code, type: String, desc: 'End line code for multi-line note' optional :old_path, type: String, desc: 'File path before change'
optional :type, type: String, desc: 'End line type for multi-line note' optional :old_line, type: Integer, desc: 'Line number before change'
optional :old_line, type: String, desc: 'End old_line line number' optional :width, type: Integer, desc: 'Width of the image'
optional :new_line, type: String, desc: 'End new_line line number' optional :height, type: Integer, desc: 'Height of the image'
optional :x, type: Integer, desc: 'X coordinate in the image'
optional :y, type: Integer, desc: 'Y coordinate in the image'
if noteable_type == MergeRequest
optional :line_range, type: Hash, desc: 'Multi-line start and end' do
optional :start, type: Hash do
optional :line_code, type: String, desc: 'Start line code for multi-line note'
optional :type, type: String, desc: 'Start line type for multi-line note'
optional :old_line, type: String, desc: 'Start old_line line number'
optional :new_line, type: String, desc: 'Start new_line line number'
end
optional :end, type: Hash do
optional :line_code, type: String, desc: 'End line code for multi-line note'
optional :type, type: String, desc: 'End line type for multi-line note'
optional :old_line, type: String, desc: 'End old_line line number'
optional :new_line, type: String, desc: 'End new_line line number'
end
end
end end
end end
end end
@ -122,12 +129,12 @@ module API
end end
end end
desc "Get comments in a single #{noteable_type.to_s.downcase} discussion" do desc "Get comments in a single #{notable_name} discussion" do
success Entities::Discussion success Entities::Discussion
end end
params do params do
requires :discussion_id, type: String, desc: 'The ID of a discussion' requires :discussion_id, type: String, desc: 'The ID of a discussion'
requires :noteable_id, types: [Integer, String], desc: 'The ID of the noteable' requires :noteable_id, type: notable_id_type, desc: "The ID of the #{notable_name}"
end end
get ":id/#{noteables_path}/:noteable_id/discussions/:discussion_id/notes", feature_category: feature_category do get ":id/#{noteables_path}/:noteable_id/discussions/:discussion_id/notes", feature_category: feature_category do
noteable = find_noteable(noteable_type, params[:noteable_id]) noteable = find_noteable(noteable_type, params[:noteable_id])
@ -140,11 +147,11 @@ module API
present notes, with: Entities::Note present notes, with: Entities::Note
end end
desc "Add a comment to a #{noteable_type.to_s.downcase} discussion" do desc "Add a comment to a #{notable_name} discussion" do
success Entities::Note success Entities::Note
end end
params do params do
requires :noteable_id, types: [Integer, String], desc: 'The ID of the noteable' requires :noteable_id, type: notable_id_type, desc: "The ID of the #{notable_name}"
requires :discussion_id, type: String, desc: 'The ID of a discussion' requires :discussion_id, type: String, desc: 'The ID of a discussion'
requires :body, type: String, desc: 'The content of a note' requires :body, type: String, desc: 'The content of a note'
optional :created_at, type: String, desc: 'The creation date of the note' optional :created_at, type: String, desc: 'The creation date of the note'
@ -175,11 +182,11 @@ module API
end end
end end
desc "Get a comment in a #{noteable_type.to_s.downcase} discussion" do desc "Get a comment in a #{notable_name} discussion" do
success Entities::Note success Entities::Note
end end
params do params do
requires :noteable_id, types: [Integer, String], desc: 'The ID of the noteable' requires :noteable_id, type: notable_id_type, desc: "The ID of the #{notable_name}"
requires :discussion_id, type: String, desc: 'The ID of a discussion' requires :discussion_id, type: String, desc: 'The ID of a discussion'
requires :note_id, type: Integer, desc: 'The ID of a note' requires :note_id, type: Integer, desc: 'The ID of a note'
end end
@ -189,11 +196,11 @@ module API
get_note(noteable, params[:note_id]) get_note(noteable, params[:note_id])
end end
desc "Edit a comment in a #{noteable_type.to_s.downcase} discussion" do desc "Edit a comment in a #{notable_name} discussion" do
success Entities::Note success Entities::Note
end end
params do params do
requires :noteable_id, types: [Integer, String], desc: 'The ID of the noteable' requires :noteable_id, type: notable_id_type, desc: "The ID of the #{notable_name}"
requires :discussion_id, type: String, desc: 'The ID of a discussion' requires :discussion_id, type: String, desc: 'The ID of a discussion'
requires :note_id, type: Integer, desc: 'The ID of a note' requires :note_id, type: Integer, desc: 'The ID of a note'
optional :body, type: String, desc: 'The content of a note' optional :body, type: String, desc: 'The content of a note'
@ -210,11 +217,11 @@ module API
end end
end end
desc "Delete a comment in a #{noteable_type.to_s.downcase} discussion" do desc "Delete a comment in a #{notable_name} discussion" do
success Entities::Note success Entities::Note
end end
params do params do
requires :noteable_id, types: [Integer, String], desc: 'The ID of the noteable' requires :noteable_id, type: notable_id_type, desc: "The ID of the #{notable_name}"
requires :discussion_id, type: String, desc: 'The ID of a discussion' requires :discussion_id, type: String, desc: 'The ID of a discussion'
requires :note_id, type: Integer, desc: 'The ID of a note' requires :note_id, type: Integer, desc: 'The ID of a note'
end end
@ -225,11 +232,11 @@ module API
end end
if Noteable.resolvable_types.include?(noteable_type.to_s) if Noteable.resolvable_types.include?(noteable_type.to_s)
desc "Resolve/unresolve an existing #{noteable_type.to_s.downcase} discussion" do desc "Resolve/unresolve an existing #{notable_name} discussion" do
success Entities::Discussion success Entities::Discussion
end end
params do params do
requires :noteable_id, types: [Integer, String], desc: 'The ID of the noteable' requires :noteable_id, type: notable_id_type, desc: "The ID of the #{notable_name}"
requires :discussion_id, type: String, desc: 'The ID of a discussion' requires :discussion_id, type: String, desc: 'The ID of a discussion'
requires :resolved, type: Boolean, desc: 'Mark discussion resolved/unresolved' requires :resolved, type: Boolean, desc: 'Mark discussion resolved/unresolved'
end end

2
package.json
View File

@ -54,7 +54,7 @@
"@gitlab/at.js": "1.5.7", "@gitlab/at.js": "1.5.7",
"@gitlab/favicon-overlay": "2.0.0", "@gitlab/favicon-overlay": "2.0.0",
"@gitlab/svgs": "3.5.0", "@gitlab/svgs": "3.5.0",
"@gitlab/ui": "49.0.0", "@gitlab/ui": "49.0.1",
"@gitlab/visual-review-tools": "1.7.3", "@gitlab/visual-review-tools": "1.7.3",
"@gitlab/web-ide": "0.0.1-dev-20220815034418", "@gitlab/web-ide": "0.0.1-dev-20220815034418",
"@rails/actioncable": "6.1.4-7", "@rails/actioncable": "6.1.4-7",

4
spec/frontend/artifacts/components/artifact_row_spec.js
View File

@ -1,4 +1,4 @@
import { GlBadge, GlButton } from '@gitlab/ui'; import { GlBadge, GlButton, GlFriendlyWrap } from '@gitlab/ui';
import mockGetJobArtifactsResponse from 'test_fixtures/graphql/artifacts/graphql/queries/get_job_artifacts.query.graphql.json'; import mockGetJobArtifactsResponse from 'test_fixtures/graphql/artifacts/graphql/queries/get_job_artifacts.query.graphql.json';
import { numberToHumanSize } from '~/lib/utils/number_utils'; import { numberToHumanSize } from '~/lib/utils/number_utils';
import { shallowMountExtended } from 'helpers/vue_test_utils_helper'; import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
@ -23,7 +23,7 @@ describe('ArtifactRow component', () => {
isLoading: false, isLoading: false,
isLastRow: false, isLastRow: false,
}, },
stubs: { GlBadge, GlButton }, stubs: { GlBadge, GlButton, GlFriendlyWrap },
}); });
}; };

8
yarn.lock
View File

@ -1113,10 +1113,10 @@
resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-3.5.0.tgz#226240b7aa93db986f4c6f7738ca2a1846b5234d" resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-3.5.0.tgz#226240b7aa93db986f4c6f7738ca2a1846b5234d"
integrity sha512-/djPsJzUY7i/FaydRVt3ZyXiFf5HGNo1rg2mfLn1EpXvT4zc2ag5ECwnYcPb97KgqFCJX6Tk+Ndu8Wh3GoOW1g== integrity sha512-/djPsJzUY7i/FaydRVt3ZyXiFf5HGNo1rg2mfLn1EpXvT4zc2ag5ECwnYcPb97KgqFCJX6Tk+Ndu8Wh3GoOW1g==
"@gitlab/ui@49.0.0": "@gitlab/ui@49.0.1":
version "49.0.0" version "49.0.1"
resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-49.0.0.tgz#dee2b7de7e4d7e281cd7ccf324d0fb5ad3086a5c" resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-49.0.1.tgz#ee26f7250363502bb4d5b15f40534f4f68e65a6d"
integrity sha512-UOPiGi12wTvbqzJAWo1PDmtZXvcSzy5/auh8qKO9l3uYo4j0RpqYeloSkLvRSKs3V82lpVi0pyJt/S+mMzPjxA== integrity sha512-u/qMexzVckgf1zyKmXGDsSUzeF7CLBJP4EvdgN9ijDmq1mQRhGKx73FRUc7g+RSCSQCPpxhD5k1vY7aTouxYgQ==
dependencies: dependencies:
"@popperjs/core" "^2.11.2" "@popperjs/core" "^2.11.2"
bootstrap-vue "2.20.1" bootstrap-vue "2.20.1"