From 61acef4a109bed4920524066879309b6f57eb578 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Sat, 4 Dec 2021 03:13:26 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .gitlab/ci/rules.gitlab-ci.yml | 2 +- doc/api/discussions.md | 2 +- doc/ci/pipelines/job_artifacts.md | 2 +- doc/user/project/merge_requests/reviews/index.md | 2 +- package.json | 4 ++-- yarn.lock | 16 ++++++++-------- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index ec28488fe05..6be48dc79fd 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -172,7 +172,7 @@ - "scripts/lint-doc.sh" .docs-deprecations-patterns: &docs-deprecations-patterns - - "doc/deprecations/index.md" + - "doc/update/deprecations.md" - "data/deprecations/*.yml" - "data/deprecations/templates/_deprecation_template.md.erb" - "lib/tasks/gitlab/docs/compile_deprecations.rake" diff --git a/doc/api/discussions.md b/doc/api/discussions.md index 18b74e1450f..5f750df4a48 100644 --- a/doc/api/discussions.md +++ b/doc/api/discussions.md @@ -987,7 +987,7 @@ addition by referencing line 157 in the *new* file: ```shell curl --request POST --header "PRIVATE-TOKEN: [ACCESS_TOKEN]"\ --form "note=This is brilliant!" --form "path=hello.rb"\ - --form "line=157" --form "line_type=old"\ + --form "line=157" --form "line_type=new"\ "https://gitlab.com/api/v4/projects/47/repository/commits//comments" ``` diff --git a/doc/ci/pipelines/job_artifacts.md b/doc/ci/pipelines/job_artifacts.md index 73d9c1f728c..cc805506f0d 100644 --- a/doc/ci/pipelines/job_artifacts.md +++ b/doc/ci/pipelines/job_artifacts.md @@ -283,7 +283,7 @@ test: ``` With this configuration, GitLab adds a link **artifact 1** to the relevant merge request -that points to `file1.txt`. To access the link, select **View exposed artifact** +that points to `file.txt`. To access the link, select **View exposed artifact** below the pipeline graph in the merge request overview. An example that matches an entire directory: diff --git a/doc/user/project/merge_requests/reviews/index.md b/doc/user/project/merge_requests/reviews/index.md index be26ce9176f..c34a8116625 100644 --- a/doc/user/project/merge_requests/reviews/index.md +++ b/doc/user/project/merge_requests/reviews/index.md @@ -72,7 +72,7 @@ When you submit your review, GitLab: ### Resolve or unresolve thread with a comment -Review comments can also resolve or unresolve [resolvable threads](../../../discussions/index.md#resolve-a-thread)). +Review comments can also resolve or unresolve [resolvable threads](../../../discussions/index.md#resolve-a-thread). When replying to a comment, a checkbox is displayed to resolve or unresolve the thread after publication. diff --git a/package.json b/package.json index 8829e164bb0..777c630e506 100644 --- a/package.json +++ b/package.json @@ -55,9 +55,9 @@ "@babel/preset-env": "^7.10.1", "@gitlab/at.js": "1.5.7", "@gitlab/favicon-overlay": "2.0.0", - "@gitlab/svgs": "1.223.0", + "@gitlab/svgs": "1.225.0", "@gitlab/tributejs": "1.0.0", - "@gitlab/ui": "32.41.0", + "@gitlab/ui": "32.42.0", "@gitlab/visual-review-tools": "1.6.1", "@rails/actioncable": "6.1.4-1", "@rails/ujs": "6.1.4-1", diff --git a/yarn.lock b/yarn.lock index e766ca09d89..61e3807bb0d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -914,20 +914,20 @@ stylelint-declaration-strict-value "1.7.7" stylelint-scss "3.18.0" -"@gitlab/svgs@1.223.0": - version "1.223.0" - resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.223.0.tgz#658e2ec0fc1e34abd1a2a1d946ac2863aa408160" - integrity sha512-buIXhQ24UVAs6aVqqXhVy4V9dXGIVOOBnh3+4JNoqp+5xPBff/1L6WalJuyANvRgHdkeBTuP9EPyYh11urSMgg== +"@gitlab/svgs@1.225.0": + version "1.225.0" + resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.225.0.tgz#a77f7118903586c1770736201693dd4f861120d9" + integrity sha512-ws58e2iNxtPBZbKGL/6ghH2BCtpX18j8mXO3H3QG+ooJHMnWVo3tn6/NuYDT1LPWIndrZRUX+Vg/KoPRpbQOJw== "@gitlab/tributejs@1.0.0": version "1.0.0" resolved "https://registry.yarnpkg.com/@gitlab/tributejs/-/tributejs-1.0.0.tgz#672befa222aeffc83e7d799b0500a7a4418e59b8" integrity sha512-nmKw1+hB6MHvlmPz63yPwVs1qQkycHwsKgxpEbzmky16Y6mL4EJMk3w1b8QlOAF/AIAzjCERPhe/R4MJiohbZw== -"@gitlab/ui@32.41.0": - version "32.41.0" - resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-32.41.0.tgz#d88f34c8ccf120d4834ab5eac8196469cabfbd34" - integrity sha512-WKLYLDwOj36nOpzFtFWN/ScTZfh9qX3on3qo1hEqakBHgUhZPCkUi/W2vp9S89RrBV9qSxgGzvj+d0iw50XXgQ== +"@gitlab/ui@32.42.0": + version "32.42.0" + resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-32.42.0.tgz#e45299124b08a6804fff5dc9358d93b9d02680c6" + integrity sha512-EGV91sM38Tp0eEsK/xeBE6Sd1nOiLO0u5pSNU9fJgfwDQuTpUC/YV5OeKpE4drnOQpxLGUOeGOFogAzv9zcbDg== dependencies: "@babel/standalone" "^7.0.0" bootstrap-vue "2.20.1"