diff --git a/.gitlab/issue_templates/Bug.md b/.gitlab/issue_templates/Bug.md index 711a00a9fa1..9ad6f69f79e 100644 --- a/.gitlab/issue_templates/Bug.md +++ b/.gitlab/issue_templates/Bug.md @@ -88,6 +88,20 @@ will also determine whether the bug is fixed in a more recent version. --> +### Patch release information for backports + +If the bug fix needs to be backported in a [patch release](https://handbook.gitlab.com/handbook/engineering/releases/patch-releases) to a version +under [the maintenance policy](https://docs.gitlab.com/policy/maintenance/), please follow the steps on the +[patch release runbook for GitLab engineers](https://gitlab.com/gitlab-org/release/docs/-/blob/master/general/patch/engineers.md). + +Refer to the [internal "Release Information" dashboard](https://dashboards.gitlab.net/d/delivery-release_info/delivery3a-release-information?orgId=1) +for information about the next patch release, including the targeted versions, expected release date, and current status. + +#### High-severity bug remediation + +To remediate high-severity issues requiring an [internal release](https://handbook.gitlab.com/handbook/engineering/releases/internal-releases/) for single-tenant SaaS instances, +refer to the [internal release process for engineers](https://gitlab.com/gitlab-org/release/docs/-/blob/master/general/internal-releases/engineers.md?ref_type=heads). + /label ~"type::bug" diff --git a/.rubocop_todo/capybara/visibility_matcher.yml b/.rubocop_todo/capybara/visibility_matcher.yml index f063bbe0275..f78734eb854 100644 --- a/.rubocop_todo/capybara/visibility_matcher.yml +++ b/.rubocop_todo/capybara/visibility_matcher.yml @@ -43,7 +43,6 @@ Capybara/VisibilityMatcher: - 'spec/features/users/email_verification_on_login_spec.rb' - 'spec/features/users/overview_spec.rb' - 'spec/features/users/user_browses_projects_on_user_page_spec.rb' - - 'spec/features/webauthn_spec.rb' - 'spec/support/helpers/features/canonical_link_helpers.rb' - 'spec/support/shared_examples/features/discussion_comments_shared_example.rb' - 'spec/support/shared_examples/features/page_description_shared_examples.rb' diff --git a/app/assets/javascripts/batch_comments/components/review_drawer.vue b/app/assets/javascripts/batch_comments/components/review_drawer.vue index e00d0b06304..07c62d80850 100644 --- a/app/assets/javascripts/batch_comments/components/review_drawer.vue +++ b/app/assets/javascripts/batch_comments/components/review_drawer.vue @@ -153,6 +153,9 @@ export default { 'discardDrafts', 'clearDrafts', ]), + isOnLatestDiff(draft) { + return draft.position?.head_sha === this.getNoteableData.diff_head_sha; + }, async onClickDraft(draft) { if (this.viewDiffsFileByFile) { await this.goToFile({ path: draft.file_path }); diff --git a/app/assets/javascripts/ci/pipeline_details/graph/components/job_group_dropdown.vue b/app/assets/javascripts/ci/pipeline_details/graph/components/job_group_dropdown.vue index 31867d5f9b3..de412cdbc54 100644 --- a/app/assets/javascripts/ci/pipeline_details/graph/components/job_group_dropdown.vue +++ b/app/assets/javascripts/ci/pipeline_details/graph/components/job_group_dropdown.vue @@ -118,16 +118,16 @@ export default {