diff --git a/.gitlab/ci/static-analysis.gitlab-ci.yml b/.gitlab/ci/static-analysis.gitlab-ci.yml index 0ccda31a296..98073c7ad7b 100644 --- a/.gitlab/ci/static-analysis.gitlab-ci.yml +++ b/.gitlab/ci/static-analysis.gitlab-ci.yml @@ -234,7 +234,7 @@ ping-appsec-for-sast-findings: - .ping-appsec-for-sast-findings:rules variables: # Project Access Token bot ID for /gitlab-com/gl-security/appsec/sast-custom-rules - BOT_USER_ID: 14406065 + BOT_USER_ID: 19650678 needs: - semgrep-appsec-custom-rules script: diff --git a/app/assets/javascripts/ci/runner/components/registration/google_cloud_registration_instructions.vue b/app/assets/javascripts/ci/runner/components/registration/google_cloud_registration_instructions.vue index e5da1b2eb57..95ea8b0c144 100644 --- a/app/assets/javascripts/ci/runner/components/registration/google_cloud_registration_instructions.vue +++ b/app/assets/javascripts/ci/runner/components/registration/google_cloud_registration_instructions.vue @@ -46,14 +46,6 @@ export default { stepTwoDescription: s__( 'Runners|To view the setup instructions, complete the previous form. The instructions help you set up an autoscaling fleet of runners to execute your CI/CD jobs in Google Cloud.', ), - projectIdLabel: s__('Runners|Google Cloud project ID'), - projectIdDescription: s__( - 'Runners|To improve security, use a dedicated project for CI/CD, separate from resources and identity management projects. %{linkStart}Where’s my project ID in Google Cloud?%{linkEnd}', - ), - zonesLinkText: s__('Runners|View available zones'), - machineTypeDescription: s__( - 'Runners|For most CI/CD jobs, use a %{linkStart}N2D standard machine type%{linkEnd}.', - ), runnerSetupBtnText: s__('Runners|Setup instructions'), copyCommands: __('Copy commands'), emptyFieldsAlertMessage: s__( @@ -329,18 +321,20 @@ export default { ref="cloudProjectId" v-model="cloudProjectId" name="cloudProjectId" - :label="$options.i18n.projectIdLabel" + :label="s__('Runners|Google Cloud project ID')" :invalid-feedback-if-empty="s__('Runners|Project ID is required.')" - :invalid-feedback-if-malformed=" - s__( - 'Runners|Project ID must be 6 to 30 lowercase letters, digits, or hyphens. It needs to start with a lowercase letter and end with a letter or number.', - ) - " + :invalid-feedback-if-malformed="s__('Runners|Project ID must have the right format.')" :regexp="$options.GC_PROJECT_PATTERN" data-testid="project-id-input" > @@ -360,9 +359,7 @@ export default { v-model="region" name="region" :invalid-feedback-if-empty="s__('Runners|Region is required.')" - :invalid-feedback-if-malformed=" - s__('Runners|Region must have the correct format. Example: us-central1') - " + :invalid-feedback-if-malformed="s__('Runners|Region must have the right format.')" :regexp="$options.GC_REGION_PATTERN" data-testid="region-input" > @@ -377,6 +374,18 @@ export default { + @@ -406,10 +413,28 @@ export default { @@ -418,11 +443,7 @@ export default { v-model="machineType" name="machineType" :invalid-feedback-if-empty="s__('Runners|Machine type is required.')" - :invalid-feedback-if-malformed=" - s__( - 'Runners|Machine type must have the format `family-series-size`. Example: n2d-standard-2', - ) - " + :invalid-feedback-if-malformed="s__('Runners|Machine type must have the right format.')" :regexp="$options.GC_MACHINE_TYPE_PATTERN" data-testid="machine-type-input" > @@ -442,7 +463,13 @@ export default { diff --git a/app/assets/javascripts/lib/utils/bootstrap_linked_tabs.js b/app/assets/javascripts/lib/utils/bootstrap_linked_tabs.js deleted file mode 100644 index 286fc2568b2..00000000000 --- a/app/assets/javascripts/lib/utils/bootstrap_linked_tabs.js +++ /dev/null @@ -1,121 +0,0 @@ -import $ from 'jquery'; - -/** - * Linked Tabs - * - * Handles persisting and restores the current tab selection and content. - * Reusable component for static content. - * - * ### Example Markup - * - *