diff --git a/.gitlab/ci/test-on-cng/main.gitlab-ci.yml b/.gitlab/ci/test-on-cng/main.gitlab-ci.yml index 5430a598177..848aae25b9b 100644 --- a/.gitlab/ci/test-on-cng/main.gitlab-ci.yml +++ b/.gitlab/ci/test-on-cng/main.gitlab-ci.yml @@ -25,6 +25,7 @@ workflow: --chart-sha "${GITLAB_HELM_CHART_REF}" \ --admin-token "${GITLAB_QA_ADMIN_ACCESS_TOKEN}" \ --retry 1 \ + --resource-preset high \ --ci \ ${EXTRA_DEPLOY_VALUES} - export QA_GITLAB_URL="http://gitlab.${GITLAB_DOMAIN}" @@ -66,6 +67,7 @@ workflow: - | bundle exec orchestrator create deployment "${DEPLOYMENT_TYPE}" \ --chart-sha "${GITLAB_HELM_CHART_REF}" \ + --resource-preset high \ --ci \ --print-deploy-args \ $(cat $CI_PROJECT_DIR/EXTRA_DEPLOY_VALUES) diff --git a/.gitlab/issue_templates/SAST Rules release.md b/.gitlab/issue_templates/SAST Rules release.md similarity index 92% rename from .gitlab/issue_templates/SAST Rules release.md rename to .gitlab/issue_templates/SAST Rules release.md index bde3ed43790..095d02d4792 100644 --- a/.gitlab/issue_templates/SAST Rules release.md +++ b/.gitlab/issue_templates/SAST Rules release.md @@ -6,7 +6,7 @@ /assign @gitlab-org/secure/static-analysis/reaction-rotation -Note: If the rules release includes support for a new file type, the engineer(s) on reaction rotation will refine and schedule the for an upcoming milestone. +Note: If the rules release includes support for a new file type, the engineer(s) on reaction rotation will refine and schedule the for an upcoming milestone. ## Actions for ~"group::static analysis" team member @@ -22,9 +22,9 @@ Release the new Semgrep SAST ruleset version X.Y.Z by going through the sequence ``` 1. [ ] If support for a new file type is required: 1. [ ] Add new extension to https://gitlab.com/gitlab-org/security-products/analyzers/semgrep/-/blob/main/plugin/plugin.go. - 1. [ ] Update [SAST components template](https://gitlab.com/components/sast/-/blob/main/templates/sast.yml) to add support for new file type - 1. [ ] Update the SAST templates [SAST.latest.gitlab-ci.yml](https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Jobs/SAST.latest.gitlab-ci.yml) + 1. [ ] Update [SAST components template](https://gitlab.com/components/sast/-/blob/main/templates/sast.yml) to add support for new file type. + 1. [ ] Update the SAST templates [SAST.latest.gitlab-ci.yml](https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Jobs/SAST.latest.gitlab-ci.yml). and [SAST.gitlab-ci.yml](https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Jobs/SAST.gitlab-ci.yml) to support new file types. - 1. [ ] Update the [SAST documentation](https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/user/application_security/sast/_index.md) + 1. [ ] Update the [SAST documentation](https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/user/application_security/sast/_index.md). /label ~"group::static analysis" ~"devops::application security testing" ~"section::sec" ~"Category:SAST" ~"type::feature" ~"workflow::refinement" diff --git a/.gitlab/lint/unused_helper_methods/potential_methods_to_remove.yml b/.gitlab/lint/unused_helper_methods/potential_methods_to_remove.yml index 7f86ff4d301..6e882666415 100644 --- a/.gitlab/lint/unused_helper_methods/potential_methods_to_remove.yml +++ b/.gitlab/lint/unused_helper_methods/potential_methods_to_remove.yml @@ -97,5 +97,3 @@ dismiss_two_factor_auth_recovery_settings_check;: file: app/helpers/users/callouts_helper.rb all_visibility_levels_restricted?: file: app/helpers/visibility_level_helper.rb -link_to_wiki_page: - file: app/helpers/wiki_helper.rb diff --git a/.rubocop_todo/rspec/named_subject.yml b/.rubocop_todo/rspec/named_subject.yml index fc27ddbe373..16a6a40eebb 100644 --- a/.rubocop_todo/rspec/named_subject.yml +++ b/.rubocop_todo/rspec/named_subject.yml @@ -3128,7 +3128,6 @@ RSpec/NamedSubject: - 'spec/services/user_agent_detail_service_spec.rb' - 'spec/services/users/activity_service_spec.rb' - 'spec/services/users/approve_service_spec.rb' - - 'spec/services/users/assigned_issues_count_service_spec.rb' - 'spec/services/users/keys_count_service_spec.rb' - 'spec/services/users/reject_service_spec.rb' - 'spec/services/vs_code/settings/create_or_update_service_spec.rb' diff --git a/.rubocop_todo/style/inline_disable_annotation.yml b/.rubocop_todo/style/inline_disable_annotation.yml index ec57be69ca4..593a8b78953 100644 --- a/.rubocop_todo/style/inline_disable_annotation.yml +++ b/.rubocop_todo/style/inline_disable_annotation.yml @@ -648,7 +648,6 @@ Style/InlineDisableAnnotation: - 'app/services/todos/destroy/unauthorized_features_service.rb' - 'app/services/topics/merge_service.rb' - 'app/services/user_project_access_changed_service.rb' - - 'app/services/users/assigned_issues_count_service.rb' - 'app/services/users/batch_status_cleaner_service.rb' - 'app/services/users/destroy_service.rb' - 'app/services/users/last_push_event_service.rb' diff --git a/app/assets/javascripts/gitlab_pages/components/deployments.vue b/app/assets/javascripts/gitlab_pages/components/deployments.vue index 08406f9560c..20898e1503f 100644 --- a/app/assets/javascripts/gitlab_pages/components/deployments.vue +++ b/app/assets/javascripts/gitlab_pages/components/deployments.vue @@ -3,6 +3,7 @@ import { GlToggle, GlAlert } from '@gitlab/ui'; import { s__ } from '~/locale'; import CrudComponent from '~/vue_shared/components/crud_component.vue'; import getProjectPagesDeployments from '../queries/get_project_pages_deployments.graphql'; +import LiveBlock from './live_block.vue'; import PagesDeployment from './deployment.vue'; import LoadMoreDeployments from './load_more_deployments.vue'; @@ -11,6 +12,7 @@ export default { components: { CrudComponent, LoadMoreDeployments, + LiveBlock, PagesDeployment, GlToggle, GlAlert, @@ -57,6 +59,9 @@ export default { loadedParallelDeploymentsCount() { return this.parallelDeployments?.nodes.length || 0; }, + newestDeployment() { + return this.primaryDeployments?.nodes[0] || null; + }, }, apollo: { primaryDeployments: { @@ -160,6 +165,8 @@ export default { {{ $options.i18n.loadErrorMessage }} + + +import { GlButton, GlSkeletonLoader } from '@gitlab/ui'; +import TimeAgo from '~/vue_shared/components/time_ago_tooltip.vue'; +import { SHORT_DATE_FORMAT_WITH_TIME } from '~/vue_shared/constants'; +import { s__ } from '~/locale'; +import { joinPaths } from '~/lib/utils/url_utility'; +import CrudComponent from '~/vue_shared/components/crud_component.vue'; + +export default { + name: 'PrimaryDeployment', + components: { + GlButton, + GlSkeletonLoader, + TimeAgo, + CrudComponent, + }, + i18n: { + createdLabel: s__('Pages|Created'), + deployJobLabel: s__('Pages|Deploy job'), + lastUpdatedLabel: s__('Pages|Last updated'), + liveSite: s__('Pages|Your Pages site is live at'), + buttonLabel: s__('Pages|Visit site'), + }, + static: { + SHORT_DATE_FORMAT_WITH_TIME, + }, + inject: ['projectFullPath', 'primaryDomain'], + props: { + deployment: { + type: Object, + required: false, + default: () => ({}), + }, + isLoading: { + type: Boolean, + required: true, + }, + }, + computed: { + domainName() { + return this.primaryDomain || this.deployment.url; + }, + ciBuildUrl() { + return joinPaths( + gon.relative_url_root || '/', + this.projectFullPath, + '/-/jobs/', + `${this.deployment.ciBuildId}`, + ); + }, + }, +}; + + + diff --git a/app/assets/javascripts/gitlab_pages/show.js b/app/assets/javascripts/gitlab_pages/show.js index a5878de0d07..c45516569e1 100644 --- a/app/assets/javascripts/gitlab_pages/show.js +++ b/app/assets/javascripts/gitlab_pages/show.js @@ -27,6 +27,7 @@ export default function initPages() { apolloProvider, provide: { projectFullPath: el.dataset.fullPath, + primaryDomain: el.dataset.primaryDomain, }, render(createElement) { return createElement(PagesEdit, {}); diff --git a/app/assets/javascripts/glql/components/presenters/issuable.vue b/app/assets/javascripts/glql/components/presenters/issuable.vue index 9d2fa2b92fe..bd5772552f9 100644 --- a/app/assets/javascripts/glql/components/presenters/issuable.vue +++ b/app/assets/javascripts/glql/components/presenters/issuable.vue @@ -44,11 +44,6 @@ export default { await this.$nextTick(); initIssuablePopovers([this.$refs.reference.$el]); }, - methods: { - truncateText(text, length = 50) { - return text.length > length ? `${text.substring(0, length - 3)}...` : text; - }, - }, };