diff --git a/.eslint_todo/vue-no-unused-properties.mjs b/.eslint_todo/vue-no-unused-properties.mjs index b89792ea0b9..a0fe940472f 100644 --- a/.eslint_todo/vue-no-unused-properties.mjs +++ b/.eslint_todo/vue-no-unused-properties.mjs @@ -288,14 +288,6 @@ export default { 'app/assets/javascripts/webhooks/components/form_custom_header_item.vue', 'app/assets/javascripts/work_items/components/create_work_item.vue', 'app/assets/javascripts/work_items/components/design_management/design_notes/design_discussion.vue', - 'app/assets/javascripts/work_items/components/notes/system_note.vue', - 'app/assets/javascripts/work_items/components/notes/work_item_activity_sort_filter.vue', - 'app/assets/javascripts/work_items/components/notes/work_item_add_note.vue', - 'app/assets/javascripts/work_items/components/notes/work_item_comment_locked.vue', - 'app/assets/javascripts/work_items/components/notes/work_item_note.vue', - 'app/assets/javascripts/work_items/components/notes/work_item_note_actions.vue', - 'app/assets/javascripts/work_items/components/notes/work_item_note_awards_list.vue', - 'app/assets/javascripts/work_items/components/notes/work_item_note_body.vue', 'app/assets/javascripts/work_items/components/shared/work_item_link_child_metadata.vue', 'app/assets/javascripts/work_items/components/shared/work_item_token_input.vue', 'app/assets/javascripts/work_items/components/work_item_assignees.vue', @@ -318,7 +310,6 @@ export default { 'app/assets/javascripts/work_items/components/work_item_links/work_item_rolled_up_data.vue', 'app/assets/javascripts/work_items/components/work_item_links/work_item_tree.vue', 'app/assets/javascripts/work_items/components/work_item_milestone.vue', - 'app/assets/javascripts/work_items/components/work_item_notes.vue', 'app/assets/javascripts/work_items/components/work_item_notifications_widget.vue', 'app/assets/javascripts/work_items/components/work_item_relationships/work_item_relationship_list.vue', 'app/assets/javascripts/work_items/components/work_item_state_toggle.vue', diff --git a/.gitlab/ci/qa-common/main.gitlab-ci.yml b/.gitlab/ci/qa-common/main.gitlab-ci.yml index 032cb918adc..fcd87b732b3 100644 --- a/.gitlab/ci/qa-common/main.gitlab-ci.yml +++ b/.gitlab/ci/qa-common/main.gitlab-ci.yml @@ -87,7 +87,6 @@ stages: - .docker-in-docker - .qa-install - .e2e-test-variables - image: "${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images/${BUILD_OS}-${OS_VERSION}-ruby-${RUBY_VERSION}-rust-${RUST_VERSION}:git-${GIT_VERSION}-lfs-${LFS_VERSION}-chrome-${CHROME_VERSION}-docker-${DOCKER_VERSION}-kubectl-${KUBECTL_VERSION}-helm-${HELM_VERSION}-kind-${KIND_VERSION}" variables: # variables related to failure issue reporting # default values from /ci/qa-report.gitlab-ci.yml will work with gitlab-qa orchestrator but not with cng and gdk tests diff --git a/.gitlab/ci/test-on-cng/main.gitlab-ci.yml b/.gitlab/ci/test-on-cng/main.gitlab-ci.yml index 68d3fac54e4..b0fa36dd5a6 100644 --- a/.gitlab/ci/test-on-cng/main.gitlab-ci.yml +++ b/.gitlab/ci/test-on-cng/main.gitlab-ci.yml @@ -30,6 +30,7 @@ workflow: - export QA_GITLAB_URL="http://gitlab.${GITLAB_DOMAIN}" .cng-test: + image: "${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images/ci/${BUILD_OS}-${OS_VERSION}-slim-ruby-${RUBY_VERSION}:rubygems-${RUBYGEMS_VERSION}-git-${GIT_VERSION}-lfs-${LFS_VERSION}-chrome-${CHROME_VERSION}-docker-${DOCKER_VERSION}-kubectl-${KUBECTL_VERSION}-helm-${HELM_VERSION}-kind-${KIND_VERSION}" stage: test extends: - .e2e-test-base diff --git a/.gitlab/ci/test-on-gdk/main.gitlab-ci.yml b/.gitlab/ci/test-on-gdk/main.gitlab-ci.yml index 4cbe6fa6878..ad9c504d855 100644 --- a/.gitlab/ci/test-on-gdk/main.gitlab-ci.yml +++ b/.gitlab/ci/test-on-gdk/main.gitlab-ci.yml @@ -28,6 +28,7 @@ workflow: - mv $CI_BUILDS_DIR/*.log $CI_PROJECT_DIR/ .gdk-qa-base: + image: "${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images/ci/${BUILD_OS}-${OS_VERSION}-slim-ruby-${RUBY_VERSION}:rubygems-${RUBYGEMS_VERSION}-git-${GIT_VERSION}-lfs-${LFS_VERSION}-chrome-${CHROME_VERSION}-docker-${DOCKER_VERSION}" extends: - .e2e-test-base # ignore runtime data from gdk because it's significantly slower than cng and runtime data for diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 60f4e7aeff9..571fef9dcf7 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -5ddaf4012bca2e5291f21503c5df3ccd7bafe62f +cdfcfafe0ef01938ccb97298d64245e6a5f0fbf1 diff --git a/app/assets/javascripts/ci/common/pipeline_inputs/inputs_adoption_banner.vue b/app/assets/javascripts/ci/common/pipeline_inputs/inputs_adoption_banner.vue index b11c7795d65..e1293532597 100644 --- a/app/assets/javascripts/ci/common/pipeline_inputs/inputs_adoption_banner.vue +++ b/app/assets/javascripts/ci/common/pipeline_inputs/inputs_adoption_banner.vue @@ -1,12 +1,11 @@ @@ -36,13 +25,7 @@ export default {