Add latest changes from gitlab-org/gitlab@master

Gemfile.lock

@@ -400,7 +400,7 @@ GEM
       po_to_json (>= 1.0.0)
       rails (>= 3.2.0)
     git (1.5.0)
-    gitaly (13.3.0.pre.rc1)
+    gitaly (13.3.0.pre.rc2)
       grpc (~> 1.0)
     github-markup (1.7.0)
     gitlab-chronic (0.10.5)

doc/administration/logs.md

@@ -837,6 +837,29 @@ For example:
 
 This message shows that Geo detected that a repository update was needed for project `1`.
 
+## `update_mirror_service_json.log`
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/commit/7f637e2af7006dc2b1b2649d9affc0b86cfb33c4) in GitLab 11.12.
+
+This file is stored in:
+
+- `/var/log/gitlab/gitlab-rails/update_mirror_service_json.log` for Omnibus GitLab installations.
+- `/home/git/gitlab/log/update_mirror_service_json.log` for installations from source.
+
+This file contains information about any errors that occurred during project mirroring.
+
+```json
+{
+   "severity":"ERROR",
+   "time":"2020-07-28T23:29:29.473Z",
+   "correlation_id":"5HgIkCJsO53",
+   "user_id":"x",
+   "project_id":"x",
+   "import_url":"https://mirror-source/group/project.git",
+   "error_message":"The LFS objects download list couldn't be imported. Error: Unauthorized"
+}
+```
+
 ## Registry Logs
 
 For Omnibus installations, Container Registry logs reside in `/var/log/gitlab/registry/current`.

doc/user/project/integrations/webhooks.md

@@ -727,7 +727,7 @@ X-Gitlab-Event: Note Hook
         "type": "ProjectLabel",
         "group_id": null
       }
-    ],
+    ]
   }
 }
 ```

lib/gitlab/ci/features.rb

@@ -31,7 +31,7 @@ module Gitlab
       end
 
       def self.pipeline_status_omit_commit_sha_in_cache_key?(project)
-        Feature.enabled?(:ci_pipeline_status_omit_commit_sha_in_cache_key, project)
+        Feature.enabled?(:ci_pipeline_status_omit_commit_sha_in_cache_key, project, default_enabled: true)
       end
 
       def self.release_generation_enabled?