Skip to content

Commit b3d2045

Browse files
MaedahBatoolMaedahBatool
authored
Merge branch 'main' into jb-autoedits
2 parents 4a4577f + 5629910 commit b3d2045

File tree

12 files changed

+8333
-8256
lines changed

12 files changed

+8333
-8256
lines changed

‎baseai/memory/docs/index.ts‎ renamed to ‎baseai/memory/memory-sg-docs-live/index.ts‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import { MemoryI } from '@baseai/core';
22

33
const memoryDocs = (): MemoryI => ({
4-
name: 'docs',
5-
description: 'Docs folder of sourcegraph docs repository as an auto-synced memory',
4+
name: 'memory-sg-docs-live',
5+
description: 'An AI memory storing all Sourcegraph docs.',
66
git: {
77
enabled: true,
88
include: ['**/*.mdx'],
99
gitignore: true,
10-
deployedAt: '5f3fec8530280d01a783aadcdeb0ccc3f9cd8b70',
11-
embeddedAt: ''
10+
embeddedAt: '',
11+
deployedAt: 'ab6065ecc6c667a5b8c0ded35498a17659d34333'
1212
},
1313
documents: {
1414
meta: doc => {
@@ -22,3 +22,6 @@ const memoryDocs = (): MemoryI => ({
2222
});
2323

2424
export default memoryDocs;
25+
26+
// Old
27+
// deployedAt: '5f3fec8530280d01a783aadcdeb0ccc3f9cd8b70',

‎docs/cody/embedded-repos.mdx‎

Lines changed: 0 additions & 1942 deletions
This file was deleted.

‎docs/releases.mdx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ Currently supported versions of Sourcegraph:
2020
| 6.1 Patch 2 | February 2025 | ✅ | [Notes](https://sourcegraph.com/docs/technical-changelog#v611295) | [Install](https://sourcegraph.com/docs/admin/deploy) |
2121
| 6.1 Patch 1 | February 2025 | ✅ | [Notes](https://sourcegraph.com/docs/technical-changelog#v61376) | [Install](https://sourcegraph.com/docs/admin/deploy) |
2222
| 6.1 Patch 0 | February 2025 | ✅ | [Notes](https://sourcegraph.com/docs/technical-changelog#v610) | [Install](https://sourcegraph.com/docs/admin/deploy) |
23+
| 6.0 Patch 2 | April 2025 | ✅ | [Notes](https://sourcegraph.com/docs/technical-changelog#v6012741) | [Install](https://sourcegraph.com/docs/admin/deploy) |
2324
| 6.0 Patch 1 | February 2025 | ✅ | [Notes](https://sourcegraph.com/docs/technical-changelog#v602687) | [Install](https://sourcegraph.com/docs/admin/deploy) |
2425
| 6.0 Patch 0 | January 2025 | ✅ | [Notes](https://sourcegraph.com/docs/technical-changelog#v600) | [Install](https://sourcegraph.com/docs/admin/deploy) |
2526
| 5.11 Patch 5 | January 2025 | ✅ | [Notes](https://sourcegraph.com/docs/technical-changelog#v5116271) | [Install](https://sourcegraph.com/docs/admin/deploy) |

‎docs/technical-changelog.mdx‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1623,9 +1623,52 @@ Revert "fix: set the tag in the push_all.sh script" `(PR #2989)`
16231623

16241624
{/* RSS={"version":"v6.1.0", "releasedAt": "2025-02-17"} */}
16251625

1626+
# 6.0 Patch 2
1627+
1628+
> Attention - This patch contains security fixes for a know issue in previous 6.0 releases. This issue does not affect
1629+
> 6.1 and later Sourcegraph releases. Customers on previous 6.0 releases are advised to upgrade to the latest version of Sourcegraph.
1630+
> If you are required to continue on 6.0 release series, please upgrade to 6.0 Patch 2.
1631+
1632+
## v6.0.12741
1633+
1634+
- [sourcegraph](https://github.com/sourcegraph/sourcegraph/releases/tag/v6.0.12741)
1635+
1636+
- [docker-compose](https://github.com/sourcegraph/deploy-sourcegraph-docker/releases/tag/v6.0.12741)
1637+
1638+
- [helm](https://github.com/sourcegraph/deploy-sourcegraph-helm/releases/tag/v6.0.12741)
1639+
1640+
- [kustomize](https://github.com/sourcegraph/deploy-sourcegraph-k8s/releases/tag/v6.0.12741)
1641+
1642+
### Features
1643+
1644+
#### Dev
1645+
1646+
- Enable gcloud beta `(PR #3490)`
1647+
1648+
#### Release
1649+
1650+
- Fix post-release version selection `(PR #4659)`
1651+
1652+
#### Others
1653+
1654+
- Update cody web to 0.31.1 to fix issue with pasting linebreaks (#3696) `(PR #3728)`
1655+
- Fix: prompt templates should not fail when pasting linebreaks
1656+
1657+
1658+
### Uncategorized
1659+
1660+
#### Others
1661+
1662+
- [Backport 6.0.x] security/fix: don't print access tokens `(PR #4801)`
1663+
1664+
{/* RSS={"version":"v6.0.12741", "releasedAt": "2025-04-09"} */}
16261665

16271666
# 6.0 Patch 1
16281667

1668+
> Attention - This patch contains a known security issue. This issue does not affect 6.1 and later Sourcegraph releases.
1669+
> Customers on previous this release are advised to upgrade to the latest version of Sourcegraph.
1670+
> If you are required to continue on 6.0 release series, please upgrade to 6.0 Patch 2.
1671+
16291672
## v6.0.2687
16301673

16311674
- [sourcegraph](https://github.com/sourcegraph/sourcegraph/releases/tag/v6.0.2687)
@@ -1703,6 +1746,10 @@ Revert "fix: set the tag in the push_all.sh script" `(PR #2989)`
17031746

17041747
# 6.0 Patch 0
17051748

1749+
> Attention - This patch contains a known security issue. This issue does not affect 6.1 and later Sourcegraph releases.
1750+
> Customers on previous this release are advised to upgrade to the latest version of Sourcegraph.
1751+
> If you are required to continue on 6.0 release series, please upgrade to 6.0 Patch 2.
1752+
17061753
> Attention - Postgres 12 is no longer supported! If upgrading from Sourcegraph version 5.9 or earlier, this release will update our included database container images from Postgres 12 to Postgres 16.
17071754
> Customers are advised to have a database backup before upgrading. See our [postgres 12 end of life](https://sourcegraph.com/docs/admin/postgres12_end_of_life_notice#postgres-12-end-of-life) notice for more information.
17081755
>

‎package.json‎

Lines changed: 77 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -1,78 +1,79 @@
11
{
2-
"name": "sourcegraph-docs",
3-
"version": "0.1.0",
4-
"private": true,
5-
"scripts": {
6-
"dev": "next dev",
7-
"build": "next build",
8-
"start": "next start",
9-
"lint": "next lint",
10-
"baseai": "baseai",
11-
"sync": "npx baseai@latest deploy -m docs",
12-
"llmstxt": "node scripts/llms-txt-generator.js"
13-
},
14-
"browserslist": "defaults, not ie <= 11",
15-
"dependencies": {
16-
"@algolia/autocomplete-core": "^1.9.2",
17-
"@algolia/client-search": "^4.22.1",
18-
"@baseai/core": "^0.9.40",
19-
"@docsearch/react": "3",
20-
"@headlessui/react": "^1.7.13",
21-
"@heroicons/react": "^2.0.18",
22-
"@langbase/components": "^0.1.5",
23-
"@mdx-js/mdx": "^3.0.1",
24-
"@next/third-parties": "^14.1.4",
25-
"@radix-ui/react-hover-card": "^1.1.1",
26-
"@radix-ui/react-select": "^2.0.0",
27-
"@radix-ui/react-slot": "^1.0.2",
28-
"@tailwindcss/typography": "^0.5.7",
29-
"@types/node": "20.4.9",
30-
"@types/react": "18.2.20",
31-
"@types/react-dom": "18.2.7",
32-
"@types/react-highlight-words": "^0.16.4",
33-
"algoliasearch": "^4.22.1",
34-
"autoprefixer": "^10.4.12",
35-
"class-variance-authority": "^0.7.0",
36-
"clsx": "^1.2.1",
37-
"contentlayer": "^0.3.4",
38-
"date-fns": "^2.30.0",
39-
"fast-glob": "^3.2.12",
40-
"feed": "^4.2.2",
41-
"flexsearch": "^0.7.31",
42-
"github-slugger": "^2.0.0",
43-
"js-yaml": "^4.1.0",
44-
"kbar": "^0.1.0-beta.44",
45-
"langbase": "^1.1.26",
46-
"lucide-react": "^0.372.0",
47-
"mdx": "^0.3.1",
48-
"next": "^14.2.3",
49-
"next-contentlayer": "^0.3.4",
50-
"next-themes": "^0.2.1",
51-
"prism-react-renderer": "^2.0.6",
52-
"react": "18.3.1",
53-
"react-dom": "18.3.1",
54-
"react-highlight-words": "^0.20.0",
55-
"react-syntax-highlighter": "^15.5.0",
56-
"rehype-autolink-headings": "^7.1.0",
57-
"rehype-pretty-code": "^0.10.2",
58-
"rehype-slug": "^6.0.0",
59-
"rehype-toc": "^3.0.2",
60-
"remark-gfm": "3.0.1",
61-
"shiki": "^0.14.5",
62-
"simple-functional-loader": "^1.2.1",
63-
"tailwind-merge": "^2.3.0",
64-
"tailwindcss": "^3.3.3",
65-
"tailwindcss-animate": "^1.0.7",
66-
"typescript": "5.1.6",
67-
"unist-util-visit": "^5.0.0"
68-
},
69-
"devDependencies": {
70-
"baseai": "^0.9.40",
71-
"eslint": "8.45.0",
72-
"eslint-config-next": "13.4.16",
73-
"glob": "^11.0.1",
74-
"prettier": "^3.0.1",
75-
"prettier-plugin-tailwindcss": "^0.5.2",
76-
"sharp": "^0.32.0"
77-
}
2+
"name": "sourcegraph-docs",
3+
"version": "0.1.0",
4+
"private": true,
5+
"scripts": {
6+
"dev": "next dev",
7+
"build": "next build",
8+
"start": "next start",
9+
"lint": "next lint",
10+
"baseai": "baseai",
11+
"sync": "npx baseai@latest deploy -m memory-sg-docs-live",
12+
"llmstxt": "node scripts/llms-txt-generator.js"
13+
},
14+
"browserslist": "defaults, not ie <= 11",
15+
"dependencies": {
16+
"@algolia/autocomplete-core": "^1.9.2",
17+
"@algolia/client-search": "^4.22.1",
18+
"@baseai/core": "^0.9.40",
19+
"@docsearch/react": "3",
20+
"@headlessui/react": "^1.7.13",
21+
"@heroicons/react": "^2.0.18",
22+
"@langbase/components": "^0.1.8",
23+
"@mdx-js/mdx": "^3.0.1",
24+
"@next/third-parties": "^14.1.4",
25+
"@radix-ui/react-hover-card": "^1.1.1",
26+
"@radix-ui/react-select": "^2.0.0",
27+
"@radix-ui/react-slot": "^1.0.2",
28+
"@tailwindcss/typography": "^0.5.7",
29+
"@types/node": "20.4.9",
30+
"@types/react": "18.2.20",
31+
"@types/react-dom": "18.2.7",
32+
"@types/react-highlight-words": "^0.16.4",
33+
"algoliasearch": "^4.22.1",
34+
"autoprefixer": "^10.4.12",
35+
"class-variance-authority": "^0.7.0",
36+
"clsx": "^1.2.1",
37+
"contentlayer": "^0.3.4",
38+
"date-fns": "^2.30.0",
39+
"fast-glob": "^3.2.12",
40+
"feed": "^4.2.2",
41+
"flexsearch": "^0.7.31",
42+
"github-slugger": "^2.0.0",
43+
"js-yaml": "^4.1.0",
44+
"kbar": "^0.1.0-beta.44",
45+
"langbase": "^1.1.46",
46+
"lucide-react": "^0.372.0",
47+
"mdx": "^0.3.1",
48+
"next": "^14.2.3",
49+
"next-contentlayer": "^0.3.4",
50+
"next-themes": "^0.2.1",
51+
"prism-react-renderer": "^2.0.6",
52+
"react": "18.3.1",
53+
"react-dom": "18.3.1",
54+
"react-highlight-words": "^0.20.0",
55+
"react-syntax-highlighter": "^15.5.0",
56+
"rehype-autolink-headings": "^7.1.0",
57+
"rehype-pretty-code": "^0.10.2",
58+
"rehype-slug": "^6.0.0",
59+
"rehype-toc": "^3.0.2",
60+
"remark-gfm": "3.0.1",
61+
"shiki": "^0.14.5",
62+
"simple-functional-loader": "^1.2.1",
63+
"tailwind-merge": "^2.3.0",
64+
"tailwindcss": "^3.3.3",
65+
"tailwindcss-animate": "^1.0.7",
66+
"typescript": "5.1.6",
67+
"unist-util-visit": "^5.0.0"
68+
},
69+
"devDependencies": {
70+
"baseai": "^0.9.40",
71+
"dotenv": "^16.4.7",
72+
"eslint": "8.45.0",
73+
"eslint-config-next": "13.4.16",
74+
"glob": "^11.0.1",
75+
"prettier": "^3.0.1",
76+
"prettier-plugin-tailwindcss": "^0.5.2",
77+
"sharp": "^0.32.0"
78+
}
7879
}

0 commit comments

Comments
 (0)