diff --git a/.gitlab/ci/docs.gitlab-ci.yml b/.gitlab/ci/docs.gitlab-ci.yml index 279bc462d71..eeccecafb8b 100644 --- a/.gitlab/ci/docs.gitlab-ci.yml +++ b/.gitlab/ci/docs.gitlab-ci.yml @@ -38,7 +38,7 @@ review-docs-cleanup: script: - ./scripts/trigger-build docs cleanup -docs lint: +docs-lint markdown: extends: - .default-retry - .docs:rules:docs-lint @@ -47,6 +47,15 @@ docs lint: needs: [] script: - scripts/lint-doc.sh + +docs-lint links: + extends: + - .default-retry + - .docs:rules:docs-lint + image: "registry.gitlab.com/gitlab-org/gitlab-docs/lint:ruby-2.7.2-alpine-3.12-vale-2.4.3-markdownlint-0.24.0" + stage: test + needs: [] + script: # Prepare docs for build # The path must be 'ee/' because we have hardcoded links relying on it # https://gitlab.com/gitlab-org/gitlab-docs/-/blob/887850752fc0e72856da6632db132f005ba77f16/content/index.erb#L44-63 diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 920d7f9bf9c..9524711e948 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -0926b9f8ff2215874eef0e22f750a74da5fe4321 +194a9f58926793ade53152de90b474d66804e21e diff --git a/app/assets/javascripts/environments/components/delete_environment_modal.vue b/app/assets/javascripts/environments/components/delete_environment_modal.vue index 29aab268fd3..2eb2be351b3 100644 --- a/app/assets/javascripts/environments/components/delete_environment_modal.vue +++ b/app/assets/javascripts/environments/components/delete_environment_modal.vue @@ -1,29 +1,35 @@