diff --git a/.gitlab/ci/build-images.gitlab-ci.yml b/.gitlab/ci/build-images.gitlab-ci.yml
index 1b041c9af38..3c7056a92c1 100644
--- a/.gitlab/ci/build-images.gitlab-ci.yml
+++ b/.gitlab/ci/build-images.gitlab-ci.yml
@@ -15,27 +15,7 @@ build-qa-image:
stage: build-images
needs: []
script:
- # Tag with commit SHA by default
- - export QA_IMAGE="${CI_REGISTRY}/${CI_PROJECT_PATH}/gitlab-ee-qa:${CI_COMMIT_SHA}"
- # For branches, tag with slugified branch name. For tags, use the tag directly
- - export QA_IMAGE_BRANCH="${CI_REGISTRY}/${CI_PROJECT_PATH}/gitlab-ee-qa:${CI_COMMIT_TAG:-$CI_COMMIT_REF_SLUG}"
- # Auto-deploy tag format uses first 12 letters of commit SHA. Tag with that
- # reference also
- - export QA_IMAGE_FOR_AUTO_DEPLOY="${CI_REGISTRY}/${CI_PROJECT_PATH}/gitlab-ee-qa:${CI_COMMIT_SHA:0:11}"
- - echo $QA_IMAGE
- - echo $QA_IMAGE_BRANCH
- - echo $QA_IMAGE_FOR_AUTO_DEPLOY
- - |
- /kaniko/executor \
- --context=${CI_PROJECT_DIR} \
- --dockerfile=${CI_PROJECT_DIR}/qa/Dockerfile \
- --destination=${QA_IMAGE} \
- --destination=${QA_IMAGE_BRANCH} \
- --destination=${QA_IMAGE_FOR_AUTO_DEPLOY} \
- --build-arg=CHROME_VERSION=${CHROME_VERSION} \
- --build-arg=DOCKER_VERSION=${DOCKER_VERSION} \
- --build-arg=QA_BUILD_TARGET=${QA_BUILD_TARGET:-qa} \
- --cache=true
+ - ./scripts/build_qa_image
# This image is used by:
# - The `CNG` pipelines (via the `review-build-cng` job): https://gitlab.com/gitlab-org/build/CNG/-/blob/cfc67136d711e1c8c409bf8e57427a644393da2f/.gitlab-ci.yml#L335
diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index 699e4a0c856..56481189ebf 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-c13d9d902ef8175a0b1165ef0bc8643fb37b7897
+d7181e813e602f80bf53e47089da92b6342b355f
diff --git a/app/assets/javascripts/diffs/components/diff_file_header.vue b/app/assets/javascripts/diffs/components/diff_file_header.vue
index 705b43a222d..91c3df39e32 100644
--- a/app/assets/javascripts/diffs/components/diff_file_header.vue
+++ b/app/assets/javascripts/diffs/components/diff_file_header.vue
@@ -281,7 +281,7 @@ export default {
'gl-z-dropdown-menu!': idState.moreActionsShown,
'is-sidebar-moved': glFeatures.movedMrSidebar,
}"
- class="js-file-title file-title file-title-flex-parent"
+ class="js-file-title file-title file-title-flex-parent gl-border"
data-qa-selector="file_title_container"
:data-qa-file-name="filePath"
@click.self="handleToggleFile"
diff --git a/app/assets/javascripts/groups/components/new_top_level_group_alert.vue b/app/assets/javascripts/groups/components/new_top_level_group_alert.vue
new file mode 100644
index 00000000000..c6af6cdb59f
--- /dev/null
+++ b/app/assets/javascripts/groups/components/new_top_level_group_alert.vue
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+ {{ $options.i18n.bodyText }}
+
+
+
+
diff --git a/app/assets/javascripts/notes/components/diff_discussion_header.vue b/app/assets/javascripts/notes/components/diff_discussion_header.vue
index 1b1923a90f7..cf6474270a2 100644
--- a/app/assets/javascripts/notes/components/diff_discussion_header.vue
+++ b/app/assets/javascripts/notes/components/diff_discussion_header.vue
@@ -84,8 +84,8 @@ export default {
return sprintf(text, { commitDisplay, linkStart, linkEnd }, false);
},
- adaptiveAvatarSize() {
- return { default: 24, md: 32 };
+ toggleClass() {
+ return this.discussion.expanded ? 'expanded' : 'collapsed';
},
},
methods: {
@@ -98,16 +98,13 @@ export default {
-