Merge branch 'main' into hectorsector/visible-links

Author: docubot

content/desktop/installing-and-configuring-github-desktop/configuring-and-customizing-github-desktop/configuring-a-default-editor.md

@@ -34,6 +34,8 @@ shortTitle: Configure default editor
 - [CodeRunner](https://coderunnerapp.com/)
 - [SlickEdit](https://www.slickedit.com/)
 - [Xcode](https://developer.apple.com/xcode/)
+- [RStudio](https://rstudio.com/)
+- [Nova](https://nova.app/)
 - [Android Studio](https://developer.android.com/studio)
 
 {% endmac %}
@@ -47,10 +49,18 @@ shortTitle: Configure default editor
 - [ColdFusion Builder](https://www.adobe.com/products/coldfusion-builder.html)
 - [Typora](https://typora.io/)
 - [SlickEdit](https://www.slickedit.com/)
+- [JetBrains IntelliJ Idea](https://www.jetbrains.com/idea/)
 - [JetBrains WebStorm](https://www.jetbrains.com/webstorm/)
 - [JetBrains PhpStorm](https://www.jetbrains.com/phpstorm/)
 - [JetBrains Rider](https://www.jetbrains.com/rider/)
+- [JetBrains CLion](https://www.jetbrains.com/clion/)
+- [JetBrains PyCharm](https://www.jetbrains.com/pycharm/)
+- [JetBrains RubyMine](https://www.jetbrains.com/rubymine/)
+- [JetBrains GoLand](https://www.jetbrains.com/go/)
+- [Android Studio](https://developer.android.com/studio)
+- [Brackets](http://brackets.io/)
 - [Notepad++](https://notepad-plus-plus.org/)
+- [RStudio](https://rstudio.com/)
 
 {% endwindows %}
 

tests/rendering/static-assets.js

@@ -1,7 +1,7 @@
 import fs from 'fs'
 import path from 'path'
 
-import { expect } from '@jest/globals'
+import { jest, expect } from '@jest/globals'
 
 import { get } from '../helpers/e2etest.js'
 import { checkCachingHeaders } from '../helpers/caching-headers.js'
@@ -14,6 +14,8 @@ function getNextStaticAsset(directory) {
 }
 
 describe('static assets', () => {
+  jest.setTimeout(60 * 1000)
+
   it('should serve /assets/cb-* with optimal headers', async () => {
     const res = await get('/assets/cb-1234/images/site/logo.png')
     expect(res.statusCode).toBe(200)