Merge pull request #36171 from github/repo-sync

Repo sync
github · Feb 4, 2025 · 20deffb · 20deffb
2 parents bca2d96 + 12d6749
commit 20deffb
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 5 deletions.
diff --git a/config/kubernetes/production/deployments/webapp.yaml b/config/kubernetes/production/deployments/webapp.yaml
@@ -23,8 +23,8 @@ spec:
           image: docs-internal
           resources:
             requests:
-              cpu: 4000m
-              memory: 8Gi
+              cpu: 1000m
+              memory: 4500Mi
             limits:
               cpu: 8000m
               memory: 16Gi

diff --git a/...le/customizing-your-profile/using-your-github-profile-to-enhance-your-resume.md b/...le/customizing-your-profile/using-your-github-profile-to-enhance-your-resume.md
@@ -84,7 +84,7 @@ To give the best impression, you'll want to make sure that hiring managers can u
 * **Simplify** complex functions, break down large classes, and remove redundant code
 * Provide **tests** to validate that your code is working as expected
 
-It's easiest to make these changes in {% data variables.product.prodname_vscode_shortname %} with {% data variables.product.prodname_copilot_short %}. For example, when you start typing a line comment, {% data variables.product.prodname_copilot_short %} can automatically suggest the rest of the comment. To get started, see [Set up Visual Studio Code with Copilot](https://code.visualstudio.com/docs/copilot/setup-simplified) in the Visual Studio Code documentation.
+The easiest way to follow these practices is to use {% data variables.product.prodname_copilot_short %} with {% data variables.product.prodname_vscode_shortname %}. See [Set up Visual Studio Code with Copilot](https://code.visualstudio.com/docs/copilot/setup-simplified) in the {% data variables.product.prodname_vscode_shortname %} documentation.
 
 ### Update your project's dependencies
 
@@ -102,3 +102,7 @@ If you want to improve your profile even more, incorporate these practices into
 * **Use issues, pull requests, and {% data variables.product.prodname_projects_v2 %}**. Showcase your task management and project planning skills by tracking bugs and feature requests with issues and using {% data variables.product.prodname_projects_v2 %} to organize them.
 * **Keep dependencies updated**. Use {% data variables.product.prodname_dependabot_version_updates %} to automatically update your project's dependencies with the latest security features and bug fixes.
 * **Contribute to open source**. Open source contributions showcase your collaboration skills and prove that you can work in complex code bases. For more information, see [AUTOTITLE](/get-started/exploring-projects-on-github/finding-ways-to-contribute-to-open-source-on-github).
+
+## Further reading
+
+* [AUTOTITLE](/copilot/example-prompts-for-github-copilot-chat/refactoring-code/improving-code-readability-and-maintainability)
diff --git a/src/secret-scanning/data/public-docs.yml b/src/secret-scanning/data/public-docs.yml
@@ -2100,6 +2100,17 @@
   hasPushProtection: true
   hasValidityCheck: false
   isduplicate: false
+- provider: LinkedIn
+  supportedSecret: LinkedIn Client Secret
+  secretType: linkedin_client_secret
+  versions:
+    fpt: '*'
+    ghec: '*'
+  isPublic: false
+  isPrivateWithGhas: true
+  hasPushProtection: false
+  hasValidityCheck: false
+  isduplicate: false
 - provider: Lob
   supportedSecret: Lob Live API Key
   secretType: lob_live_api_key

diff --git a/src/secret-scanning/lib/config.json b/src/secret-scanning/lib/config.json
@@ -1,5 +1,5 @@
 {
-  "sha": "4b7c10eadf71996bd2c377426a32d64ccd2d2a4f",
-  "blob-sha": "8d41807df8ca3251a421bbc85a33153cd89a15b1",
+  "sha": "c1d54b30a2779d3250e4c257fd0f02a8e6258787",
+  "blob-sha": "279704983e923e7b2ec8ccc784d68492d16e0d9a",
   "targetFilename": "code-security/secret-scanning/introduction/supported-secret-scanning-patterns"
 }
diff --git a/src/workflows/husky/post-checkout b/src/workflows/husky/post-checkout
@@ -1,6 +1,12 @@
 #!/bin/sh
 [ -n "$CI" ] && exit 0
 
+# Ignore this check if user has DOCS_NO_AUTO_NPM set in their environment
+if [ -n "$DOCS_NO_AUTO_NPM" ]; then
+  echo "Skipping auto-npm install because DOCS_NO_AUTO_NPM is set"
+  exit 0
+fi
+
 # Same process in husky/post-merge
 echo "Checking if packages need to be installed..."
 if npm run cmp-files -- package-lock.json .installed.package-lock.json; then

diff --git a/src/workflows/husky/post-merge b/src/workflows/husky/post-merge
@@ -1,6 +1,12 @@
 #!/bin/sh
 [ -n "$CI" ] && exit 0
 
+# Ignore this check if user has DOCS_NO_AUTO_NPM set in their environment
+if [ -n "$DOCS_NO_AUTO_NPM" ]; then
+  echo "Skipping auto-npm install because DOCS_NO_AUTO_NPM is set"
+  exit 0
+fi
+
 # Same process in husky/post-checkout
 echo "Checking if packages need to be installed..."
 if npm run cmp-files -- package-lock.json .installed.package-lock.json; then