diff --git a/.gitlab/ci/static-analysis.gitlab-ci.yml b/.gitlab/ci/static-analysis.gitlab-ci.yml index 7af6842fa44..879b3bffd3b 100644 --- a/.gitlab/ci/static-analysis.gitlab-ci.yml +++ b/.gitlab/ci/static-analysis.gitlab-ci.yml @@ -182,7 +182,7 @@ semgrep-appsec-custom-rules: --exclude '*_test.go' --exclude spec --exclude qa --exclude tooling --json > gl-sast-report.json || true variables: - CUSTOM_RULES_REPOSITORY: https://gitlab.com/gitlab-com/gl-security/appsec/sast-custom-rules.git + CUSTOM_RULES_REPOSITORY: https://gitlab.com/gitlab-com/gl-security/product-security/appsec/sast-custom-rules.git artifacts: expire_in: 30 days paths: @@ -234,7 +234,7 @@ ping-appsec-for-sast-findings: extends: - .ping-appsec-for-sast-findings:rules variables: - # Project Access Token bot ID for /gitlab-com/gl-security/appsec/sast-custom-rules + # Project Access Token bot ID for /gitlab-com/gl-security/product-security/appsec/sast-custom-rules BOT_USER_ID: 19650678 needs: - semgrep-appsec-custom-rules @@ -250,7 +250,7 @@ trigger-depsaster: MERGE_REQUEST_PROJECT_ID: $CI_MERGE_REQUEST_PROJECT_ID MERGE_REQUEST_IID: $CI_MERGE_REQUEST_IID trigger: - project: "gitlab-com/gl-security/appsec/tooling/depsaster" + project: "gitlab-com/gl-security/product-security/appsec/tooling/depsaster" allow_failure: true ping-appsec-for-dependency-review: @@ -261,7 +261,7 @@ ping-appsec-for-dependency-review: DISABLE_MENTIONS: "false" DISABLE_SCORING: "true" DISABLE_COMMENTING: "false" - DEPENDENCY_REVIEW_BOT_CI_REG: "${CI_REGISTRY}/gitlab-com/gl-security/appsec/tooling/depscore/master" + DEPENDENCY_REVIEW_BOT_CI_REG: "${CI_REGISTRY}/gitlab-com/gl-security/product-security/appsec/tooling/depscore/master" extends: [".ping-appsec-for-dependency-review:rules", ".use-docker-in-docker"] before_script: - apk add jq curl diff --git a/.gitlab/issue_templates/Security developer workflow.md b/.gitlab/issue_templates/Security developer workflow.md index f6ea4a915df..111730eb4c8 100644 --- a/.gitlab/issue_templates/Security developer workflow.md +++ b/.gitlab/issue_templates/Security developer workflow.md @@ -6,10 +6,10 @@ Create this issue under https://gitlab.com/gitlab-org/security/gitlab Set the title to: `Description of the original issue` --> -## Prior to starting the security release work +## Prior to starting the security work -- [ ] Read the [security process for developers] if you are not familiar with it. -- [ ] Make sure the [issue really needs to follow the security release workflow]. +- [ ] Read the [security process for engineers] if you are not familiar with it. +- [ ] Make sure the [issue really needs to follow the security workflow]. - [ ] Add a `~severity::x` label to the issue and all associated merge requests. - [ ] Mark this [issue as linked] to the `gitlab-org/gitlab` issue that describes the security vulnerability. - Fill out the [Links section](#links): @@ -20,7 +20,7 @@ Set the title to: `Description of the original issue` - [ ] Run `scripts/security-harness` in your local repository to prevent accidentally pushing to any remote besides `gitlab.com/gitlab-org/security`. - [ ] Create a new branch prefixing it with `security-`. -- [ ] Create a merge request targeting `master` on `gitlab.com/gitlab-org/security` and use the [Security Release merge request template]. +- [ ] Create a merge request targeting `master` on `gitlab.com/gitlab-org/security` and use the [Security merge request template]. - [ ] If this includes a breaking change, make sure to include a mention of it for the relevant versions in [`doc/update/index.md`](https://gitlab.com/gitlab-org/security/gitlab/-/blob/master/doc/update/index.md#version-specific-upgrading-instructions) - See if the [breaking changes workflow] applies @@ -29,10 +29,10 @@ After your merge request has been approved according to our [approval guidelines ## Backports - [ ] Once the MR is ready to be merged, create MRs targeting the latest 3 stable branches. - - The 3 stable branches correspond to the versions in the title of the [Security Release Tracking Issue]. + - The 3 stable branches correspond to the versions in the title of the [Security Tracking Issue]. - At this point, it might be easy to squash the commits from the MR into one - You can use the script `bin/secpick` instead of the following steps, to help you cherry-picking. See the [secpick documentation] -- [ ] Create each MR targeting the stable branch `X-Y-stable`, using the [Security Release merge request template]. +- [ ] Create each MR targeting the stable branch `X-Y-stable`, using the [Security merge request template]. - Every merge request will have its own set of to-dos, so make sure to complete those. - [ ] On the "Related merge requests" section, ensure that `4` merge requests are associated: The one targeting `master` and the `3` backports. - [ ] If this issue requires less than `4` merge requests, add the ~"reduced backports" label. @@ -40,8 +40,8 @@ After your merge request has been approved according to our [approval guidelines ## Assigning to a release - [ ] **IMPORTANT**: When this issue is ready for release (Default branch MR and backports are approved and ready to be merged), apply the ~"security-target" label. - - The `gitlab-release-tools-bot` evaluates and links issues with the label to the next planned security release tracking issue. If the bot finds the issue is not ready to be included in the security release, it will leave a comment on the issue explaining what needs to be done. - - This issue will only be included in a security release if it is successfully linked to the security release tracking issue. + - The `gitlab-release-tools-bot` evaluates and links issues with the label to the active [Security Tracking Issue]. If the bot finds the issue is not ready to be included in the patch release, it will leave a comment on the issue explaining what needs to be done. + - This issue will only be included in a patch release if it is successfully linked to the [Security Tracking Issue]. ## Documentation and final details @@ -75,13 +75,13 @@ After your merge request has been approved according to our [approval guidelines | Breaking change to UI or public API | Yes/No | | | Thanks | | | -[security process for developers]: https://gitlab.com/gitlab-org/release/docs/blob/master/general/security/developer.md +[security process for engineers]: https://gitlab.com/gitlab-org/release/docs/blob/master/general/security/engineer.md [secpick documentation]: https://gitlab.com/gitlab-org/release/docs/-/blob/master/general/security/utilities/secpick_script.md -[security Release merge request template]: https://gitlab.com/gitlab-org/security/gitlab/blob/master/.gitlab/merge_request_templates/Security%20Release.md +[security merge request template]: https://gitlab.com/gitlab-org/security/gitlab/blob/master/.gitlab/merge_request_templates/Security%20Fix.md [approval guidelines]: https://docs.gitlab.com/ee/development/code_review.html#approval-guidelines [issue as linked]: https://docs.gitlab.com/ee/user/project/issues/related_issues.html#add-a-linked-issue -[issue really needs to follow the security release workflow]: https://gitlab.com/gitlab-org/release/docs/-/blob/master/general/security/developer.md#making-sure-the-issue-needs-to-follow-the-security-release-workflow +[issue really needs to follow the security workflow]: https://gitlab.com/gitlab-org/release/docs/-/blob/master/general/security/engineer.md#making-sure-the-issue-needs-to-follow-the-security-release-workflow [breaking changes workflow]: https://gitlab.com/gitlab-org/release/docs/-/blob/master/general/security/far_reaching_impact_fixes_or_breaking_change_fixes.md -[Security Release Tracking Issue]: https://gitlab.com/gitlab-org/gitlab/-/issues/?label_name%5B%5D=upcoming%20security%20release +[Security Tracking Issue]: https://gitlab.com/gitlab-org/gitlab/-/issues/?label_name%5B%5D=upcoming%20security%20release /label ~security ~"security-notifications" diff --git a/.gitlab/merge_request_templates/Revert Security Merge Request.md b/.gitlab/merge_request_templates/Revert Security Merge Request.md index f29c9cc5b66..f6fb1eb8247 100644 --- a/.gitlab/merge_request_templates/Revert Security Merge Request.md +++ b/.gitlab/merge_request_templates/Revert Security Merge Request.md @@ -1,26 +1,26 @@ [Reverting a security merge request] is not encouraged because it rollbacks a security fix -compromising the integrity of GitLab.com and self-managed instances. If a security merge request +compromising the integrity of GitLab.com, self-managed and in-house instances. If a security merge request introduced a bug, the next steps will depend on the severity of the security issue, the impact of -the bug introduced and the timeline of the security release. Consult the [other ways of mitigating the bug] +the bug introduced and the timeline of the patch release. Consult the [other ways of mitigating the bug] before continuing with the revert. ## Purpose of the revert +and the severity the bug fix and due date of the patch release --> * Severity of the security issue: {+ severity +} * Severity of the bug: {+ severity +} -* Due date of the [ongoing security release]: {+ yyyy/mm/dd +} +* Due date of the [ongoing patch release]: {+ yyyy/mm/dd +} ## Checklist: - [ ] Stage team has contacted AppSec and [release managers] and explained why the revert is necessary. -- [ ] The security issue has been removed from the [security release]. -- [ ] **AppSec Approval: AppSec agrees and understands the vulnerability will be disclosed without being fixed when the security release is published** +- [ ] The security issue has been removed from the [patch release]. +- [ ] **AppSec Approval: AppSec agrees and understands the vulnerability will be disclosed without being fixed when the patch release is published** [Reverting a security merge request]: https://gitlab.com/gitlab-org/release/docs/-/blob/master/general/security/bugs_introduced_by_security_merge_request.md?ref_type=heads [other ways of mitigating the bug]: https://gitlab.com/gitlab-org/release/docs/-/blob/master/general/security/bugs_introduced_by_security_merge_request.md?ref_type=heads -[security release]: https://gitlab.com/gitlab-org/gitlab/-/issues/?label_name%5B%5D=upcoming%20security%20release +[patch release]: https://gitlab.com/gitlab-org/gitlab/-/issues/?label_name%5B%5D=upcoming%20security%20release [release managers]: https://about.gitlab.com/community/release-managers/ diff --git a/.gitlab/merge_request_templates/Security Release.md b/.gitlab/merge_request_templates/Security Fix.md similarity index 88% rename from .gitlab/merge_request_templates/Security Release.md rename to .gitlab/merge_request_templates/Security Fix.md index cffdffa9256..88ef950742d 100644 --- a/.gitlab/merge_request_templates/Security Release.md +++ b/.gitlab/merge_request_templates/Security Fix.md @@ -2,7 +2,7 @@ # README first! This MR should be created on `gitlab.com/gitlab-org/security/gitlab`. -See [the general developer security release guidelines](https://gitlab.com/gitlab-org/release/docs/blob/master/general/security/developer.md). +See [the general developer security guidelines](https://gitlab.com/gitlab-org/release/docs/blob/master/general/security/engineer.md). --> @@ -13,7 +13,7 @@ See [the general developer security release guidelines](https://gitlab.com/gitla ## Developer checklist - [ ] **On "Related issues" section, write down the [GitLab Security] issue it belongs to (i.e. `Related to `).** -- [ ] Familiarize yourself with the latest process to create Security merge requests: https://gitlab.com/gitlab-org/release/docs/blob/master/general/security/developer.md#process +- [ ] Familiarize yourself with the latest process to create Security merge requests: https://gitlab.com/gitlab-org/release/docs/blob/master/general/security/engineer.md#process - [ ] Merge request targets `master`, or a versioned stable branch (`X-Y-stable-ee`). - [ ] Title of this merge request is the same as for all backports. - [ ] A [CHANGELOG entry] has been included, with `Changelog` trailer set to `security`. @@ -21,7 +21,7 @@ See [the general developer security release guidelines](https://gitlab.com/gitla - [ ] Assign to a reviewer and maintainer, per our [Code Review process]. - [ ] Ensure it's approved according to our [Approval Guidelines]. - [ ] Ensure it's approved by an AppSec engineer. - - Please see the security release [Code reviews and Approvals] documentation for details on which AppSec team member to ping for approval. + - Please see the security [Code reviews and Approvals] documentation for details on which AppSec team member to ping for approval. - Trigger the [`e2e:package-and-test` job]. The docker image generated will be used by the AppSec engineer to validate the security vulnerability has been remediated. - [ ] For a backport MR targeting a versioned stable branch (`X-Y-stable-ee`). - [ ] Ensure it's approved by the same maintainer that reviewed and approved the merge request targeting the default branch. diff --git a/.gitlab/sast-ruleset.toml b/.gitlab/sast-ruleset.toml index e247d20da2c..296ff281bed 100644 --- a/.gitlab/sast-ruleset.toml +++ b/.gitlab/sast-ruleset.toml @@ -5,6 +5,6 @@ [[semgrep.passthrough]] type = "git" - value = "https://gitlab.com/gitlab-com/gl-security/appsec/sast-custom-rules.git" + value = "https://gitlab.com/gitlab-com/gl-security/product-security/appsec/sast-custom-rules.git" ref = "refs/heads/main" subdir = "gitlab-sast-rules" diff --git a/.rubocop_todo/rspec/feature_category.yml b/.rubocop_todo/rspec/feature_category.yml index 02ec682bc64..7b11afa8640 100644 --- a/.rubocop_todo/rspec/feature_category.yml +++ b/.rubocop_todo/rspec/feature_category.yml @@ -1008,7 +1008,6 @@ RSpec/FeatureCategory: - 'ee/spec/models/ee/project_authorization_spec.rb' - 'ee/spec/models/ee/project_group_link_spec.rb' - 'ee/spec/models/ee/project_statistics_spec.rb' - - 'ee/spec/models/ee/project_wiki_spec.rb' - 'ee/spec/models/ee/protected_ref_spec.rb' - 'ee/spec/models/ee/release_spec.rb' - 'ee/spec/models/ee/resource_label_event_spec.rb' diff --git a/.rubocop_todo/rspec/named_subject.yml b/.rubocop_todo/rspec/named_subject.yml index 2655802d653..c533591bf66 100644 --- a/.rubocop_todo/rspec/named_subject.yml +++ b/.rubocop_todo/rspec/named_subject.yml @@ -604,7 +604,6 @@ RSpec/NamedSubject: - 'ee/spec/models/ee/pages_domain_spec.rb' - 'ee/spec/models/ee/personal_access_token_spec.rb' - 'ee/spec/models/ee/project_spec.rb' - - 'ee/spec/models/ee/project_wiki_spec.rb' - 'ee/spec/models/ee/projects/branch_rule_spec.rb' - 'ee/spec/models/ee/protected_branch_spec.rb' - 'ee/spec/models/ee/resource_label_event_spec.rb' diff --git a/.rubocop_todo/style/inline_disable_annotation.yml b/.rubocop_todo/style/inline_disable_annotation.yml index 4fea397b570..c09e84907f3 100644 --- a/.rubocop_todo/style/inline_disable_annotation.yml +++ b/.rubocop_todo/style/inline_disable_annotation.yml @@ -1092,7 +1092,6 @@ Style/InlineDisableAnnotation: - 'config/initializers/fix_local_cache_middleware.rb' - 'config/initializers/fog_core_patch.rb' - 'config/initializers/grape_validators.rb' - - 'config/initializers/grpc_patch.rb' - 'config/initializers/kaminari_active_record_relation_methods_with_limit.rb' - 'config/initializers/mail_starttls_patch.rb' - 'config/initializers/postgres_cte_as_materialized.rb' @@ -1705,7 +1704,6 @@ Style/InlineDisableAnnotation: - 'ee/elastic/migrate/20230720000000_reindex_wikis_to_fix_routing.rb' - 'ee/elastic/migrate/20230724070100_backfill_epics.rb' - 'ee/elastic/migrate/20230724151612_backfill_archived_field_in_commits.rb' - - 'ee/elastic/migrate/20230724221548_remove_wikis_from_main_index.rb' - 'ee/elastic/migrate/20230821123542_backfill_archived_field_in_blob.rb' - 'ee/elastic/migrate/20230901120542_force_reindex_commits_from_main_index.rb' - 'ee/elastic/migrate/20231019223356_reindex_wikis_to_fix_routing_and_backfill_archived.rb' diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 9a3edf40074..3ef933835b2 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -1b7d24619a5fc750c340254158c2949d58ea774f +f0a471cf95e5f057d7d07692710c391d3e3822d4 diff --git a/Gemfile b/Gemfile index e415840865c..61110d45b49 100644 --- a/Gemfile +++ b/Gemfile @@ -595,7 +595,7 @@ gem 'gitaly', '~> 17.0.0.pre.rc2', feature_category: :gitaly # KAS GRPC protocol definitions gem 'kas-grpc', '~> 0.5.0', feature_category: :deployment_management -gem 'grpc', '~> 1.62', feature_category: :shared +gem 'grpc', '~> 1.63', feature_category: :shared gem 'google-protobuf', '~> 3.25', '>= 3.25.3' # rubocop:todo Gemfile/MissingFeatureCategory diff --git a/Gemfile.checksum b/Gemfile.checksum index c9fc1ac474f..f3152d62885 100644 --- a/Gemfile.checksum +++ b/Gemfile.checksum @@ -281,15 +281,15 @@ {"name":"graphql","version":"2.2.5","platform":"ruby","checksum":"15eeb4b4b29b8502de22e6f2794ea5b7bf75b3a8c0aa5d776f5e614ef543bc7e"}, {"name":"graphql-client","version":"0.19.0","platform":"ruby","checksum":"fe699d81976f916bd8f989216155326449cb8475a5d69fa1dd054012a86969c7"}, {"name":"graphql-docs","version":"4.0.0","platform":"ruby","checksum":"f68296959263db26e1b7ba7058856d67b641cf508187222268be58f09dfa02d7"}, -{"name":"grpc","version":"1.62.0","platform":"aarch64-linux","checksum":"da4a327c031408537d573ac8e32c0457f96043382865f246cc5d8707af1d74ce"}, -{"name":"grpc","version":"1.62.0","platform":"arm64-darwin","checksum":"3bed38060eaec814a9547f88369c49b9bb3d439ff1832ccff30130459af919e0"}, -{"name":"grpc","version":"1.62.0","platform":"ruby","checksum":"f624d44ce89764ed61bd0d8c585bd6d7ec4b75ad421bdc7b370f09f101f6e80f"}, -{"name":"grpc","version":"1.62.0","platform":"x64-mingw-ucrt","checksum":"5618e4c7c708c1f10c905fd61689134ebc8b4df066fdd744b94b62d53e9bf5ea"}, -{"name":"grpc","version":"1.62.0","platform":"x64-mingw32","checksum":"5e2275f8e013342dfa0d7af028f3449849fc9cad163c5fafd8ae4c9be37b50e3"}, -{"name":"grpc","version":"1.62.0","platform":"x86-linux","checksum":"3e6a37edc951fcb77c14625a83141f39a98baf86f28fa3be0d552a888385d94d"}, -{"name":"grpc","version":"1.62.0","platform":"x86-mingw32","checksum":"40d42f50877fdaf26cd37836e2388f61d9c896d268f53e7493bb259b3a669806"}, -{"name":"grpc","version":"1.62.0","platform":"x86_64-darwin","checksum":"22eb3a8d36de1da327045a57c753b45c873c12a82106e8edef40ac0a01f37776"}, -{"name":"grpc","version":"1.62.0","platform":"x86_64-linux","checksum":"59f052fda776769f12b815495f9e1f2bc9501e5a194646720eb1d73f190e9502"}, +{"name":"grpc","version":"1.63.0","platform":"aarch64-linux","checksum":"dc75c5fd570b819470781d9512105dddfdd11d984f38b8e60bb946f92d1f79ee"}, +{"name":"grpc","version":"1.63.0","platform":"arm64-darwin","checksum":"91b93a354508a9d1772f095554f2e4c04358c2b32d7a670e3705b7fc4695c996"}, +{"name":"grpc","version":"1.63.0","platform":"ruby","checksum":"5f4383c4ee2886e92c31b90422261b7527f26e3baa585d877e9804e715983686"}, +{"name":"grpc","version":"1.63.0","platform":"x64-mingw-ucrt","checksum":"bbca63f19b45cca5a485f5c5eb363a8684d23a6d0c3421bde5e72e6227291488"}, +{"name":"grpc","version":"1.63.0","platform":"x64-mingw32","checksum":"fb6251f497c8327eda92c4af293ec07fcaec4ffaa2514d3942a7c31406bfaf5b"}, +{"name":"grpc","version":"1.63.0","platform":"x86-linux","checksum":"152140fa2c28e384d3c1ded454a66d5e22fb2ff1d2920c2ef2530b2d707de6fd"}, +{"name":"grpc","version":"1.63.0","platform":"x86-mingw32","checksum":"eed13225b08e705421fef9d986de6c2310ec692df1d80f7a4d407de7c1f98525"}, +{"name":"grpc","version":"1.63.0","platform":"x86_64-darwin","checksum":"a814414ff178e89ee3ad0cc2a826ce1ca96c68063effb81affe3e5ceff7b44cc"}, +{"name":"grpc","version":"1.63.0","platform":"x86_64-linux","checksum":"41a90a597f44959c8dbb94619db2b0c0939a768569a5dfad41fffa227eb1287d"}, {"name":"grpc-google-iam-v1","version":"1.5.0","platform":"ruby","checksum":"cea356d150dac69751f6a4c71f1571c8022c69d9f4ce9c18139200932c19374e"}, {"name":"gssapi","version":"1.3.1","platform":"ruby","checksum":"c51cf30842ee39bd93ce7fc33e20405ff8a04cda9dec6092071b61258284aee1"}, {"name":"guard","version":"2.16.2","platform":"ruby","checksum":"71ba7abaddecc8be91ab77bbaf78f767246603652ebbc7b976fda497ebdc8fbb"}, diff --git a/Gemfile.lock b/Gemfile.lock index 8490d0c1e76..a8f5241a9f2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -884,7 +884,7 @@ GEM gemoji (~> 3.0) graphql (~> 2.0) html-pipeline (~> 2.14, >= 2.14.3) - grpc (1.62.0) + grpc (1.63.0) google-protobuf (~> 3.25) googleapis-common-protos-types (~> 1.0) grpc-google-iam-v1 (1.5.0) @@ -2057,7 +2057,7 @@ DEPENDENCIES graphlyte (~> 1.0.0) graphql (~> 2.2.5) graphql-docs (~> 4.0.0) - grpc (~> 1.62) + grpc (~> 1.63) gssapi (~> 1.3.1) guard-rspec haml_lint (~> 0.57) diff --git a/app/assets/javascripts/admin/application_settings/inactive_project_deletion/components/form.vue b/app/assets/javascripts/admin/application_settings/inactive_project_deletion/components/form.vue index 0b640a34864..7f328c9569b 100644 --- a/app/assets/javascripts/admin/application_settings/inactive_project_deletion/components/form.vue +++ b/app/assets/javascripts/admin/application_settings/inactive_project_deletion/components/form.vue @@ -132,7 +132,7 @@ export default { data-testid="min-size-group" > {{ $options.i18n.minSizeMbDescription }} @@ -169,7 +169,7 @@ export default { data-testid="delete-after-months-group" > diff --git a/app/assets/javascripts/alert_management/components/alert_management_table.vue b/app/assets/javascripts/alert_management/components/alert_management_table.vue index 795f3c36f26..8b31d921808 100644 --- a/app/assets/javascripts/alert_management/components/alert_management_table.vue +++ b/app/assets/javascripts/alert_management/components/alert_management_table.vue @@ -53,7 +53,7 @@ export default { key: 'severity', label: s__('AlertManagement|Severity'), variant: 'secondary', - thClass: `gl-w-eighth`, + thClass: `gl-w-1/8`, thAttr: TH_TEST_ID, tdClass: `${tdClass} rounded-top text-capitalize sortable-cell`, sortable: true, @@ -62,7 +62,7 @@ export default { key: 'startedAt', label: s__('AlertManagement|Start time'), variant: 'secondary', - thClass: `js-started-at w-15p`, + thClass: `js-started-at gl-w-3/20`, tdClass: `${tdClass} sortable-cell`, sortable: true, }, @@ -82,20 +82,20 @@ export default { { key: 'issue', label: s__('AlertManagement|Incident'), - thClass: 'gl-w-15p gl-pointer-events-none', + thClass: 'gl-w-3/20 gl-pointer-events-none', tdClass, }, { key: 'assignees', label: s__('AlertManagement|Assignees'), - thClass: 'gl-w-eighth gl-pointer-events-none', + thClass: 'gl-w-1/8 gl-pointer-events-none', tdClass, }, { key: 'status', label: s__('AlertManagement|Status'), variant: 'secondary', - thClass: `w-15p`, + thClass: `gl-w-3/20`, tdClass: `${tdClass} rounded-bottom sortable-cell`, sortable: true, }, diff --git a/app/assets/javascripts/alerts_settings/components/alert_mapping_builder.vue b/app/assets/javascripts/alerts_settings/components/alert_mapping_builder.vue index 91f6a50f63d..30b62e88a5d 100644 --- a/app/assets/javascripts/alerts_settings/components/alert_mapping_builder.vue +++ b/app/assets/javascripts/alerts_settings/components/alert_mapping_builder.vue @@ -151,7 +151,7 @@ export default {
-
+
-
+
-
+
- + {{ group.name }}
-
+
{{ keybinding.description }}
diff --git a/app/assets/javascripts/ci/admin/jobs_table/constants.js b/app/assets/javascripts/ci/admin/jobs_table/constants.js index 86c9ab53e75..015749a2f59 100644 --- a/app/assets/javascripts/ci/admin/jobs_table/constants.js +++ b/app/assets/javascripts/ci/admin/jobs_table/constants.js @@ -21,12 +21,12 @@ export const RUNNER_NO_DESCRIPTION = s__('Runners|No description'); /* Admin Table constants */ /* The field list is based on app/assets/javascripts/jobs/components/table/constants.js */ export const DEFAULT_FIELDS_ADMIN = [ - { key: 'status', label: __('Status'), columnClass: 'gl-w-15p' }, - { key: 'job', label: __('Job'), columnClass: 'gl-w-20p' }, - { key: 'project', label: __('Project'), columnClass: 'gl-w-20p' }, - { key: 'runner', label: __('Runner'), columnClass: 'gl-w-15p' }, - { key: 'pipeline', label: __('Pipeline'), columnClass: 'gl-w-10p' }, - { key: 'actions', label: '', columnClass: 'gl-w-10p' }, + { key: 'status', label: __('Status'), columnClass: 'gl-w-3/20' }, + { key: 'job', label: __('Job'), columnClass: 'gl-w-4/20' }, + { key: 'project', label: __('Project'), columnClass: 'gl-w-4/20' }, + { key: 'runner', label: __('Runner'), columnClass: 'gl-w-3/20' }, + { key: 'pipeline', label: __('Pipeline'), columnClass: 'gl-w-2/20' }, + { key: 'actions', label: '', columnClass: 'gl-w-2/20' }, ]; export const RAW_TEXT_WARNING_ADMIN = RAW_TEXT_WARNING; diff --git a/app/assets/javascripts/ci/artifacts/components/artifact_row.vue b/app/assets/javascripts/ci/artifacts/components/artifact_row.vue index d4de42b10a8..026f64be10d 100644 --- a/app/assets/javascripts/ci/artifacts/components/artifact_row.vue +++ b/app/assets/javascripts/ci/artifacts/components/artifact_row.vue @@ -96,7 +96,7 @@ export default { /> @@ -108,11 +108,11 @@ export default { - + {{ artifactSize }} - + - + {{ name }} - +
diff --git a/app/assets/javascripts/entrypoints/performance_bar.js b/app/assets/javascripts/entrypoints/performance_bar.js index 3f6fc6272d0..d1be41cbed1 100644 --- a/app/assets/javascripts/entrypoints/performance_bar.js +++ b/app/assets/javascripts/entrypoints/performance_bar.js @@ -1 +1,3 @@ -import '../performance_bar'; +import '~/webpack'; +import '~/commons'; +import '~/performance_bar'; diff --git a/app/assets/javascripts/environments/environment_details/constants.js b/app/assets/javascripts/environments/environment_details/constants.js index 75bd1193cbc..6b11a5c1017 100644 --- a/app/assets/javascripts/environments/environment_details/constants.js +++ b/app/assets/javascripts/environments/environment_details/constants.js @@ -7,56 +7,56 @@ export const ENVIRONMENT_DETAILS_TABLE_FIELDS = [ { key: 'status', label: __('Status'), - columnClass: 'gl-w-10p', + columnClass: 'gl-w-2/20', tdClass: '!gl-align-middle', thClass: 'gl-border-t-none!', }, { key: 'id', label: __('ID'), - columnClass: 'gl-w-5p', + columnClass: 'gl-w-1/20', tdClass: '!gl-align-middle', thClass: 'gl-border-t-none!', }, { key: 'triggerer', label: __('Triggerer'), - columnClass: 'gl-w-10p', + columnClass: 'gl-w-2/20', tdClass: '!gl-align-middle', thClass: 'gl-border-t-none!', }, { key: 'commit', label: __('Commit'), - columnClass: 'gl-w-20p', + columnClass: 'gl-w-4/20', tdClass: '!gl-align-middle', thClass: 'gl-border-t-none!', }, { key: 'job', label: __('Job'), - columnClass: 'gl-w-15p', + columnClass: 'gl-w-3/20', tdClass: '!gl-align-middle', thClass: 'gl-border-t-none!', }, { key: 'created', label: __('Created'), - columnClass: 'gl-w-10p', + columnClass: 'gl-w-2/20', tdClass: '!gl-align-middle gl-white-space-nowrap', thClass: 'gl-border-t-none!', }, { key: 'deployed', label: __('Deployed'), - columnClass: 'gl-w-10p', + columnClass: 'gl-w-2/20', tdClass: '!gl-align-middle gl-white-space-nowrap', thClass: 'gl-border-t-none!', }, { key: 'actions', label: __('Actions'), - columnClass: 'gl-w-15p', + columnClass: 'gl-w-3/20', tdClass: '!gl-align-middle gl-white-space-nowrap', thClass: 'gl-border-t-none!', }, diff --git a/app/assets/javascripts/error_tracking/components/error_details_info.vue b/app/assets/javascripts/error_tracking/components/error_details_info.vue index 0b4eabe25d1..19c3b3f8f0c 100644 --- a/app/assets/javascripts/error_tracking/components/error_details_info.vue +++ b/app/assets/javascripts/error_tracking/components/error_details_info.vue @@ -4,7 +4,7 @@ import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; import TrackEventDirective from '~/vue_shared/directives/track_event'; import { trackClickErrorLinkToSentryOptions } from '../events_tracking'; -const CARD_CLASS = 'gl-mr-7 gl-w-15p gl-min-w-fit-content'; +const CARD_CLASS = 'gl-mr-7 gl-w-3/20 gl-min-w-fit-content'; const HEADER_CLASS = 'gl-p-2 gl-font-weight-bold gl-display-flex gl-justify-content-center gl-align-items-center'; const BODY_CLASS = diff --git a/app/assets/javascripts/error_tracking/components/error_tracking_list.vue b/app/assets/javascripts/error_tracking/components/error_tracking_list.vue index 0408e5e4bf0..e77f474f46a 100644 --- a/app/assets/javascripts/error_tracking/components/error_tracking_list.vue +++ b/app/assets/javascripts/error_tracking/components/error_tracking_list.vue @@ -46,31 +46,31 @@ export default { { key: 'error', label: __('Error'), - thClass: 'gl-w-40p', + thClass: 'gl-w-8/20', tdClass: `${tableDataClass}`, }, { key: 'timeline', label: __('Timeline'), - thClass: 'gl-text-center gl-w-20p', + thClass: 'gl-text-center gl-w-4/20', tdClass: `${tableDataClass} gl-text-center`, }, { key: 'events', label: __('Events'), - thClass: 'gl-text-center gl-w-10p', + thClass: 'gl-text-center gl-w-2/20', tdClass: `${tableDataClass} gl-text-center`, }, { key: 'users', label: __('Users'), - thClass: 'gl-text-center gl-w-10p', + thClass: 'gl-text-center gl-w-2/20', tdClass: `${tableDataClass} gl-text-center`, }, { key: 'lastSeen', label: __('Last seen'), - thClass: 'gl-text-center gl-w-10p', + thClass: 'gl-text-center gl-w-2/20', tdClass: `${tableDataClass} gl-text-center`, }, { diff --git a/app/assets/javascripts/import_entities/import_groups/components/import_table.vue b/app/assets/javascripts/import_entities/import_groups/components/import_table.vue index 20d2b34def0..193b08cf6a9 100644 --- a/app/assets/javascripts/import_entities/import_groups/components/import_table.vue +++ b/app/assets/javascripts/import_entities/import_groups/components/import_table.vue @@ -143,13 +143,13 @@ export default { { key: 'webUrl', label: s__('BulkImport|Source group'), - thClass: 'gl-pl-0! gl-w-half', + thClass: 'gl-pl-0! gl-w-1/2', tdClass: 'gl-pl-0!', }, { key: 'importTarget', label: s__('BulkImport|New group'), - thClass: `gl-w-half`, + thClass: `gl-w-1/2`, }, { key: 'progress', diff --git a/app/assets/javascripts/import_entities/import_projects/components/import_projects_table.vue b/app/assets/javascripts/import_entities/import_projects/components/import_projects_table.vue index bceded18a09..05d5705c8f4 100644 --- a/app/assets/javascripts/import_entities/import_projects/components/import_projects_table.vue +++ b/app/assets/javascripts/import_entities/import_projects/components/import_projects_table.vue @@ -187,10 +187,10 @@ export default { - -
+ {{ fromHeaderText }} + {{ __('To GitLab') }} diff --git a/app/assets/javascripts/incidents/components/incidents_list.vue b/app/assets/javascripts/incidents/components/incidents_list.vue index 16f9e9d0bfe..d15d4c71f64 100644 --- a/app/assets/javascripts/incidents/components/incidents_list.vue +++ b/app/assets/javascripts/incidents/components/incidents_list.vue @@ -54,7 +54,7 @@ export default { key: 'severity', label: s__('IncidentManagement|Severity'), variant: 'secondary', - thClass: `gl-w-15p`, + thClass: `gl-w-3/20`, tdClass: `${tdClass} sortable-cell`, actualSortKey: 'SEVERITY', sortable: true, @@ -70,7 +70,7 @@ export default { key: 'escalationStatus', label: s__('IncidentManagement|Status'), variant: 'secondary', - thClass: `gl-w-eighth`, + thClass: `gl-w-1/8`, tdClass: `${tdClass} sortable-cell`, actualSortKey: 'ESCALATION_STATUS', sortable: true, @@ -80,7 +80,7 @@ export default { key: 'createdAt', label: s__('IncidentManagement|Date created'), variant: 'secondary', - thClass: `gl-w-eighth`, + thClass: `gl-w-1/8`, tdClass: `${tdClass} sortable-cell`, actualSortKey: 'CREATED', sortable: true, @@ -90,7 +90,7 @@ export default { key: 'incidentSla', label: s__('IncidentManagement|Time to SLA'), variant: 'secondary', - thClass: `gl-text-right gl-w-10p`, + thClass: `gl-text-right gl-w-2/20`, tdClass: `${tdClass} gl-text-right`, thAttr: TH_INCIDENT_SLA_TEST_ID, actualSortKey: 'SLA_DUE_AT', @@ -99,7 +99,7 @@ export default { { key: 'assignees', label: s__('IncidentManagement|Assignees'), - thClass: 'gl-pointer-events-none gl-w-15', + thClass: 'gl-pointer-events-none gl-w-3/20', tdClass, }, { diff --git a/app/assets/javascripts/integrations/beyond_identity/components/add_exclusions_drawer.vue b/app/assets/javascripts/integrations/beyond_identity/components/add_exclusions_drawer.vue index fd4f1daf104..0c4db5ceaf8 100644 --- a/app/assets/javascripts/integrations/beyond_identity/components/add_exclusions_drawer.vue +++ b/app/assets/javascripts/integrations/beyond_identity/components/add_exclusions_drawer.vue @@ -68,7 +68,9 @@ export default {