diff --git a/.gitlab/ci/review.gitlab-ci.yml b/.gitlab/ci/review.gitlab-ci.yml index a30a63b1a51..26c7306c880 100644 --- a/.gitlab/ci/review.gitlab-ci.yml +++ b/.gitlab/ci/review.gitlab-ci.yml @@ -5,7 +5,7 @@ review-cleanup: extends: - .default-retry - .review:rules:review-cleanup - image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:gitlab-helm3-kubectl1.14 + image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:gitlab-helm3.5-kubectl1.17 stage: prepare environment: name: review/${CI_COMMIT_REF_SLUG}${FREQUENCY} diff --git a/.rubocop.yml b/.rubocop.yml index 185a2497c93..47c7e5b5e35 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -287,6 +287,11 @@ Rails/HelperInstanceVariable: - app/helpers/**/*.rb - ee/app/helpers/**/*.rb +Rails/MailerName: + Exclude: + # See for the context on why it's excluded https://gitlab.com/gitlab-org/gitlab/-/issues/239356#note_956419227 + - 'app/mailers/notify.rb' + # GitLab ################################################################### Gitlab/ModuleWithInstanceVariables: diff --git a/.rubocop_todo/rails/mailer_name.yml b/.rubocop_todo/rails/mailer_name.yml deleted file mode 100644 index 17e55c178f7..00000000000 --- a/.rubocop_todo/rails/mailer_name.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -# Cop supports --auto-correct. -Rails/MailerName: - Exclude: - - 'app/mailers/notify.rb' diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 5edc91ee661..0c336b78456 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -8eb17de6edf6b4044d90498e008035a8c980305f +9f87cdc737619e33cddc3ceddc2103dc11dd2577 diff --git a/app/assets/javascripts/groups/components/group_name_and_path.vue b/app/assets/javascripts/groups/components/group_name_and_path.vue index 6c5f39345af..f9bd8701199 100644 --- a/app/assets/javascripts/groups/components/group_name_and_path.vue +++ b/app/assets/javascripts/groups/components/group_name_and_path.vue @@ -1,5 +1,12 @@ - - {{ $options.i18n.signInText }} - + diff --git a/app/assets/javascripts/runner/components/runner_list_empty_state.vue b/app/assets/javascripts/runner/components/runner_list_empty_state.vue index cddd51a351c..ab9cde6a401 100644 --- a/app/assets/javascripts/runner/components/runner_list_empty_state.vue +++ b/app/assets/javascripts/runner/components/runner_list_empty_state.vue @@ -35,6 +35,7 @@ export default { }, }, modalId: 'runners-empty-state-instructions-modal', + svgHeight: 145, }; @@ -43,9 +44,15 @@ export default { v-if="isSearchFiltered" :title="s__('Runners|No results found')" :svg-path="filteredSvgPath" + :svg-height="$options.svgHeight" :description="s__('Runners|Edit your search and try again')" /> - +