diff --git a/.eslint_todo/vue-no-unused-properties.mjs b/.eslint_todo/vue-no-unused-properties.mjs index fefcf10d8f3..8a36574207f 100644 --- a/.eslint_todo/vue-no-unused-properties.mjs +++ b/.eslint_todo/vue-no-unused-properties.mjs @@ -96,7 +96,6 @@ export default { 'app/assets/javascripts/jira_connect/branches/components/new_branch_form.vue', 'app/assets/javascripts/jira_import/components/jira_import_form.vue', 'app/assets/javascripts/members/components/filter_sort/sort_dropdown.vue', - 'app/assets/javascripts/merge_request_dashboard/components/status_badge.vue', 'app/assets/javascripts/ml/experiment_tracking/components/candidate_list.vue', 'app/assets/javascripts/ml/experiment_tracking/components/delete_button.vue', 'app/assets/javascripts/ml/experiment_tracking/routes/candidates/promote/model_selection_dropdown.vue', @@ -219,7 +218,6 @@ export default { 'ee/app/assets/javascripts/analytics/productivity_analytics/components/app.vue', 'ee/app/assets/javascripts/analytics/repository_analytics/components/test_coverage_summary.vue', 'ee/app/assets/javascripts/analytics/repository_analytics/components/test_coverage_table.vue', - 'ee/app/assets/javascripts/audit_events/components/stream/stream_delete_modal.vue', 'ee/app/assets/javascripts/billings/components/zuora_simple.vue', 'ee/app/assets/javascripts/billings/subscriptions/components/subscription_table.vue', 'ee/app/assets/javascripts/ci/merge_trains/components/merge_trains_table.vue', diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index 255661f5861..1b02ae2da48 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -1153,6 +1153,9 @@ .build-images:rules:build-gdk-image: rules: - !reference [".qa:rules:e2e-test-never-run", rules] + # E2E tests are already executed against cng deployment so gdk is skipped + - <<: *if-merge-request-targeting-stable-branch + when: never - <<: *if-default-branch-schedule-nightly # already executed in the 2-hourly schedule when: never - <<: *if-dot-com-gitlab-org-schedule @@ -2019,6 +2022,9 @@ when: never - <<: *if-default-branch-schedule-nightly # already executed in the 2-hourly schedule when: never + # Full suite is already executed against cng deployment which is a proper release environment + - <<: *if-merge-request-targeting-stable-branch + when: never - !reference [".qa:rules:e2e-blocking-base-before", rules] # Run tests automatically for MRs that touch Ruby version files - <<: *if-merge-request @@ -2038,9 +2044,6 @@ .qa:rules:e2e:test-on-cng: rules: - # TODO: Enable for stable branches once cng is fully enabled in mr pipelines - - <<: *if-merge-request-targeting-stable-branch - when: never # TODO: Check security fork is able to build cng images before enabling - <<: *if-security-merge-request when: never diff --git a/.gitlab/ci/test-on-cng/main.gitlab-ci.yml b/.gitlab/ci/test-on-cng/main.gitlab-ci.yml index 9389e131db0..4984358767b 100644 --- a/.gitlab/ci/test-on-cng/main.gitlab-ci.yml +++ b/.gitlab/ci/test-on-cng/main.gitlab-ci.yml @@ -115,6 +115,14 @@ build-cng-env: CNG_ACCESS_TOKEN: $CNG_MIRROR_ACCESS_TOKEN CNG_SKIP_REDUNDANT_JOBS: "true" GIT_STRATEGY: none + # when running in backport, override CNG_COMMIT so it defaults to release branch instead + # this ensures images are built using same stable release branch in CNG repository + # this is needed in case CNG repository backports some fixes related to specific release + rules: + - if: $CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /^[\d-]+-stable(-ee|-jh)?$/ + variables: + CNG_COMMIT_SHA: '' + - when: always build-cng: stage: .pre diff --git a/Gemfile.lock b/Gemfile.lock index 00b354b1006..de9b4347470 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2420,4 +2420,4 @@ DEPENDENCIES yard (~> 0.9) BUNDLED WITH - 2.6.5 + 2.7.1 diff --git a/Gemfile.next.lock b/Gemfile.next.lock index 6ef02328728..f866f3c2f89 100644 --- a/Gemfile.next.lock +++ b/Gemfile.next.lock @@ -2415,4 +2415,4 @@ DEPENDENCIES yard (~> 0.9) BUNDLED WITH - 2.6.5 + 2.7.1 diff --git a/app/assets/javascripts/merge_request_dashboard/components/status_badge.vue b/app/assets/javascripts/merge_request_dashboard/components/status_badge.vue index 7cd74b47739..0f67b663dfb 100644 --- a/app/assets/javascripts/merge_request_dashboard/components/status_badge.vue +++ b/app/assets/javascripts/merge_request_dashboard/components/status_badge.vue @@ -26,6 +26,7 @@ export default { currentUserId() { return convertToGraphQLId(TYPENAME_USER, gon.current_user_id); }, + // eslint-disable-next-line vue/no-unused-properties -- currentUserAsReviewer is accessed by badge methods when 'this' component instance is passed to them. currentUserAsReviewer() { return this.mergeRequest.reviewers.nodes.find((r) => r.id === this.currentUserId); }, diff --git a/app/assets/javascripts/sidebar/components/assignees/assignee_avatar.vue b/app/assets/javascripts/sidebar/components/assignees/assignee_avatar.vue index 69d19b54e7b..79f49f1f3aa 100644 --- a/app/assets/javascripts/sidebar/components/assignees/assignee_avatar.vue +++ b/app/assets/javascripts/sidebar/components/assignees/assignee_avatar.vue @@ -1,7 +1,6 @@