Add latest changes from gitlab-org/gitlab@master

7 files changed, 42 insertions, 9 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd62854c530..f71c04de4a5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,15 @@
 documentation](doc/development/changelog.md) for instructions on adding your own
 entry.
 
+## 15.4.3 (2022-10-19)
+
+### Fixed (4 changes)
+
+- [Sign in: use custom logo again](gitlab-org/gitlab@5822562c4c3508927e3b217749867736e91316f3) ([merge request](gitlab-org/gitlab!101235))
+- [Fix closing of external issues](gitlab-org/gitlab@1302f992e3706b698c983961f596fcab03704c3f) ([merge request](gitlab-org/gitlab!101235))
+- [Sign in: use custom logo again](gitlab-org/gitlab@d760473a022ef485be7e258ab5fc406f05a127a4) ([merge request](gitlab-org/gitlab!101235))
+- [Fix REST/GRAPHQL APIs handling TODOs WorkItem target](gitlab-org/gitlab@f4157b08596040bbc504292c4a75fe2100aa570c) ([merge request](gitlab-org/gitlab!100081))
+
 ## 15.4.2 (2022-10-04)
 
 ### Fixed (1 change)
diff --git a/app/assets/stylesheets/pages/events.scss b/app/assets/stylesheets/pages/events.scss
index 33d00027404..ce8dd6684f2 100644
--- a/app/assets/stylesheets/pages/events.scss
+++ b/app/assets/stylesheets/pages/events.scss
@@ -84,6 +84,10 @@
         iframe.twitter-share-button {
           vertical-align: bottom;
         }
+
+        .gl-label-scoped.gl-label-sm {
+          --label-inset-border: inset 0 0 0 1px currentColor;
+        }
       }
 
       code {
diff --git a/doc/topics/git/lfs/index.md b/doc/topics/git/lfs/index.md
index 1ab4a8a8acc..98710315652 100644
--- a/doc/topics/git/lfs/index.md
+++ b/doc/topics/git/lfs/index.md
@@ -43,6 +43,24 @@ Documentation for GitLab instance administrators is under [LFS administration do
   [add the URL to Git configuration manually](#troubleshooting).
 - [Group wikis](../../../user/project/wiki/group.md) do not support Git LFS.
 
+## How LFS objects affect repository size
+
+When you add an LFS object to a repository, GitLab:
+
+1. Creates an LFS object.
+1. Associates the LFS object with the repository.
+1. Queues a job to recalculate your project's statistics, including storage size and
+   LFS object storage. Your LFS object storage is the sum of the size of all LFS objects
+   associated with the repository.
+
+When your repository is forked, LFS objects from the upstream project are associated
+with the fork. When the fork is created, the LFS object storage for the fork is equal
+to the storage used by the upstream project. If new LFS objects are added to the fork,
+the total object storage changes for the fork, but not the upstream project.
+
+If you create a merge request from the fork back to the upstream project,
+any new LFS objects in the fork become associated with the upstream project.
+
 ## Using Git LFS
 
 Let's take a look at the workflow for checking large files into your Git
diff --git a/doc/user/admin_area/license_file.md b/doc/user/admin_area/license_file.md
index 984dabb2651..e6186fb9805 100644
--- a/doc/user/admin_area/license_file.md
+++ b/doc/user/admin_area/license_file.md
@@ -24,6 +24,9 @@ Otherwise, to add your license:
 1. Select the **Terms of Service** checkbox.
 1. Select **Add license**.
 
+NOTE:
+For GitLab versions 14.1.x or newer, you can access the **Add License** page directly from the URL, `<YourGitLabURL>/admin/license/new`.
+
 ## Add your license file during installation
 
 You can import a license file when you install GitLab.
diff --git a/doc/user/clusters/agent/ci_cd_workflow.md b/doc/user/clusters/agent/ci_cd_workflow.md
index 7a3c09687a5..b82c557a2b7 100644
--- a/doc/user/clusters/agent/ci_cd_workflow.md
+++ b/doc/user/clusters/agent/ci_cd_workflow.md
@@ -281,13 +281,6 @@ See the [official Kubernetes documentation for details](https://kubernetes.io/do
 
 ## Troubleshooting
 
-### `kubectl` commands not supported
-
-The commands `kubectl exec`, `kubectl cp`, `kubectl attach`, `kubectl run --attach=true` and `kubectl port-forward` are not supported.
-Anything that uses these API endpoints does not work, because they use the deprecated
-SPDY protocol.
-[An issue exists](https://gitlab.com/gitlab-org/gitlab/-/issues/346248) to add support for these commands.
-
 ### Grant write permissions to `~/.kube/cache`
 
 Tools like `kubectl`, Helm, `kpt`, and `kustomize` cache information about
diff --git a/lib/api/topics.rb b/lib/api/topics.rb
index 38cfdc44021..ff28ccde788 100644
--- a/lib/api/topics.rb
+++ b/lib/api/topics.rb
@@ -42,7 +42,8 @@ module API
       requires :name, type: String, desc: 'Slug (name)'
       requires :title, type: String, desc: 'Title'
       optional :description, type: String, desc: 'Description'
-      optional :avatar, type: ::API::Validations::Types::WorkhorseFile, desc: 'Avatar image for topic'
+      optional :avatar, type: ::API::Validations::Types::WorkhorseFile, desc: 'Avatar image for topic',
+                        documentation: { type: 'file' }
     end
     post 'topics' do
       authenticated_as_admin!
@@ -65,7 +66,8 @@ module API
       optional :name, type: String, desc: 'Slug (name)'
       optional :title, type: String, desc: 'Title'
       optional :description, type: String, desc: 'Description'
-      optional :avatar, type: ::API::Validations::Types::WorkhorseFile, desc: 'Avatar image for topic'
+      optional :avatar, type: ::API::Validations::Types::WorkhorseFile, desc: 'Avatar image for topic',
+                        documentation: { type: 'file' }
     end
     put 'topics/:id' do
       authenticated_as_admin!
diff --git a/qa/qa/specs/features/browser_ui/5_package/package_registry/maven/maven_project_level_spec.rb b/qa/qa/specs/features/browser_ui/5_package/package_registry/maven/maven_project_level_spec.rb
index c3ddfb25357..324e881f160 100644
--- a/qa/qa/specs/features/browser_ui/5_package/package_registry/maven/maven_project_level_spec.rb
+++ b/qa/qa/specs/features/browser_ui/5_package/package_registry/maven/maven_project_level_spec.rb
@@ -207,6 +207,10 @@ module QA
       it(
         'uses GitLab as a mirror of the central proxy',
         :skip_live_env,
+        quarantine: {
+          issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/378221',
+          type: :investigating
+        },
         testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/375767'
       ) do
         Support::Retrier.retry_on_exception(max_attempts: 3, sleep_interval: 2) do