Merge branch 'sourcegraph:main' into main

.eslintrc.js

@@ -66,6 +66,7 @@ const config = {
     // import/no-duplicates enabled as well, which does understand type imports
     'no-duplicate-imports': 'off',
     'id-length': 'off',
+    'no-void': 'off',
     '@typescript-eslint/consistent-type-exports': 'warn',
     '@typescript-eslint/consistent-type-imports': [
       'warn',
@@ -108,12 +109,6 @@ const config = {
           },
         ],
         patterns: [
-          {
-            group: ['**/enterprise/*'],
-            message: `The OSS product may not pull in any code from the enterprise codebase, to stay a 100% open-source program.
-
-See https://handbook.sourcegraph.com/community/faq#is-all-of-sourcegraph-open-source for more information.`,
-          },
           {
             group: ['@sourcegraph/branded/src/search-ui/experimental'],
             message:

CHANGELOG.md

@@ -19,6 +19,7 @@ All notable changes to Sourcegraph are documented in this file.
 
 - The `has.topic` filter now supports filtering by Gitlab topics. [#57649](https://github.com/sourcegraph/sourcegraph/pull/57649)
 - Batch Changes now allows changesets to be exported in CSV and JSON format. [#56721](https://github.com/sourcegraph/sourcegraph/pull/56721)
+- Supports custom ChatCompletion models in Cody clients for dotcom users. [#58158](https://github.com/sourcegraph/sourcegraph/pull/58158)
 
 ### Changed
 
@@ -30,6 +31,9 @@ All notable changes to Sourcegraph are documented in this file.
 - Site configuration edit history no longer breaks when the user that made the edit is deleted. [#57656](https://github.com/sourcegraph/sourcegraph/pull/57656)
 - Drilling down into an insights query no longer mangles `content:` fields in your query. [#57679](https://github.com/sourcegraph/sourcegraph/pull/57679)
 - The blame column now shows correct blame information when a hunk starts in a folded code section. [#58042](https://github.com/sourcegraph/sourcegraph/pull/58042)
+- Fixed a bug where typing in the GraphQL editor in the Site Admin API console could cause the cursor to jump to the start of the editor. [#57862](https://github.com/sourcegraph/sourcegraph/pull/57862)
+- The blame column no longer ignores whitespace-only changes by default. [#58134](https://github.com/sourcegraph/sourcegraph/pull/58134)
+- Long lines now wrap correctly in the diff view. [#58138](https://github.com/sourcegraph/sourcegraph/pull/58138)
 
 ### Removed
 
@@ -39,28 +43,38 @@ All notable changes to Sourcegraph are documented in this file.
 - The GitHub Proxy service is no longer required and has been removed from deployment options. [#55290](https://github.com/sourcegraph/sourcegraph/issues/55290)
 - The VSCode search extension "Sourcegraph for VS Code" has been sunset and removed from Sourcegraph
   repository. [#58023](https://github.com/sourcegraph/sourcegraph/pull/58023)
+- The feature flag `search-ranking` is now completely removed. [#58156](https://github.com/sourcegraph/sourcegraph/pull/58156)
+- The notepad UI, notebook creation feature. [#58217](https://github.com/sourcegraph/sourcegraph/pull/58217)
 
 ## Unreleased 5.2.3
 
-## 5.2.2
-
 ### Added
 
-- Added a new authorization configuration options to GitLab code host connections: "markInternalReposAsPublic". Setting "markInternalReposAsPublic" to true is useful for organizations that have a large amount of internal repositories that everyone on the instance should be able to access, removing the need to have permissions to access these repositories. Additionally, when configuring a GitLab auth provider, you can specify "syncInternalRepoPermissions": false, which will remove the need to sync permissions for these internal repositories. [#57858](https://github.com/sourcegraph/sourcegraph/pull/57858)
-- Experimental support for OpenAI powered autocomplete has been added. [#57872](https://github.com/sourcegraph/sourcegraph/pull/57872)
+-
 
 ### Changed
 
 -
 
 ### Fixed
 
-- Updated the endpoint used by the AWS Bedrock Claude provider. [#58028](https://github.com/sourcegraph/sourcegraph/pull/58028)
+-
 
 ### Removed
 
 -
 
+## 5.2.2
+
+### Added
+
+- Added a new authorization configuration options to GitLab code host connections: "markInternalReposAsPublic". Setting "markInternalReposAsPublic" to true is useful for organizations that have a large amount of internal repositories that everyone on the instance should be able to access, removing the need to have permissions to access these repositories. Additionally, when configuring a GitLab auth provider, you can specify "syncInternalRepoPermissions": false, which will remove the need to sync permissions for these internal repositories. [#57858](https://github.com/sourcegraph/sourcegraph/pull/57858)
+- Experimental support for OpenAI powered autocomplete has been added. [#57872](https://github.com/sourcegraph/sourcegraph/pull/57872)
+
+### Fixed
+
+- Updated the endpoint used by the AWS Bedrock Claude provider. [#58028](https://github.com/sourcegraph/sourcegraph/pull/58028)
+
 ## 5.2.1
 
 ### Added
@@ -73,10 +87,6 @@ All notable changes to Sourcegraph are documented in this file.
   - Customers with a license key created before October 3, 2023 will export only Cody-related events recorded in the new system, as covered by the [Cody Usage and Privacy Notice](https://about.sourcegraph.com/terms/cody-notice).
   - If you have a previous agreement regarding telemetry sharing, you account representative will reach out with more details.
 
-### Changed
-
--
-
 ### Fixed
 
 - Fixed a user's Permissions page being inaccessible if the user has had no permission syncs with an external account connected. [#57372](https://github.com/sourcegraph/sourcegraph/pull/57372)
@@ -86,8 +96,6 @@ All notable changes to Sourcegraph are documented in this file.
 - Fixed a bug where commit signing failed when creating a changeset if `batchChanges.enforceFork` is set to true. [#57520](https://github.com/sourcegraph/sourcegraph/pull/57520)
 - Fixed a regression in ranking of Go struct and interface in search results. [zoekt#655](https://github.com/sourcegraph/zoekt/pull/655)
 
-### Removed
-
 ## 5.2.0
 
 ### Added

README.md

@@ -41,7 +41,6 @@
 
 ## Getting started
 
-- [**Download Sourcegraph**](https://about.sourcegraph.com/app) for macOS and Linux
 - [Use Sourcegraph on the cloud or self-hosted](https://docs.sourcegraph.com/)
 - [Sourcegraph.com public code search](https://sourcegraph.com/search)
 
@@ -67,6 +66,4 @@ The `doc` directory has additional documentation for developing and understandin
 
 ## License
 
-This repository contains primarily non-OSS-licensed files, and some OSS licensed files (for example, IDE extensions). We maintain one repository rather than two separate repositories mainly for development convenience.
-
-See the [LICENSE](LICENSE) for an explanation of how files are licensed.
+This repository contains primarily non-OSS-licensed files. See [LICENSE](LICENSE).

client/branded/BUILD.bazel

@@ -123,18 +123,16 @@ ts_project(
         "src/search-ui/input/experimental/CodeMirrorQueryInputWrapper.tsx",
         "src/search-ui/input/experimental/LazyCodeMirrorQueryInput.tsx",
         "src/search-ui/input/experimental/Suggestions.tsx",
-        "src/search-ui/input/experimental/SyntaxHighlightedSearchQuery.tsx",
         "src/search-ui/input/experimental/codemirror/example-suggestions.ts",
         "src/search-ui/input/experimental/codemirror/history.ts",
         "src/search-ui/input/experimental/codemirror/searchcontext.ts",
         "src/search-ui/input/experimental/codemirror/syntax-highlighting.ts",
         "src/search-ui/input/experimental/filters.ts",
         "src/search-ui/input/experimental/index.ts",
         "src/search-ui/input/experimental/modes.ts",
-        "src/search-ui/input/experimental/optionRenderer.tsx",
+        "src/search-ui/input/experimental/placeholder.ts",
         "src/search-ui/input/experimental/suggestionsExtension.ts",
         "src/search-ui/input/experimental/utils.ts",
-        "src/search-ui/input/toggles/CopyQueryButton.tsx",
         "src/search-ui/input/toggles/QueryInputToggle.tsx",
         "src/search-ui/input/toggles/SmartSearchToggle.tsx",
         "src/search-ui/input/toggles/Toggles.tsx",
@@ -184,7 +182,6 @@ ts_project(
         "//:node_modules/@types/lodash",
         "//:node_modules/@types/node",
         "//:node_modules/@types/react",
-        "//:node_modules/@types/react-dom",
         "//:node_modules/classnames",
         "//:node_modules/copy-to-clipboard",
         "//:node_modules/date-fns",
@@ -194,7 +191,6 @@ ts_project(
         "//:node_modules/lodash",
         "//:node_modules/mdi-react",
         "//:node_modules/react",
-        "//:node_modules/react-dom",
         "//:node_modules/react-router-dom",
         "//:node_modules/react-sticky-box",
         "//:node_modules/react-visibility-sensor",

client/branded/src/search-ui/input/SearchBox.story.tsx

@@ -24,10 +24,6 @@ export default config
 
 const defaultProps: SearchBoxProps = {
     telemetryService: NOOP_TELEMETRY_SERVICE,
-    settingsCascade: {
-        final: null,
-        subjects: null,
-    },
     queryState: { query: 'hello repo:test' },
     isSourcegraphDotCom: false,
     patternType: SearchPatternType.standard,

client/branded/src/search-ui/input/SearchBox.tsx

@@ -49,7 +49,8 @@ export interface SearchBoxProps
     /** Called with the underlying editor instance on creation. */
     onEditorCreated?: (editor: IEditor) => void
 
-    /** Whether or not to show the search history button. Also disables the
+    /**
+     * Whether or not to show the search history button. Also disables the
      * search button. Does not affect history in the search input itself (via
      * arrow up/down)
      */
@@ -191,13 +192,10 @@ export const SearchBox: FC<SearchBoxProps> = props => {
                         setCaseSensitivity={props.setCaseSensitivity}
                         searchMode={props.searchMode}
                         setSearchMode={props.setSearchMode}
-                        settingsCascade={props.settingsCascade}
                         submitSearch={props.submitSearchOnToggle}
                         navbarSearchQuery={queryState.query}
                         className={styles.searchBoxToggles}
-                        showCopyQueryButton={props.showCopyQueryButton}
                         structuralSearchDisabled={props.structuralSearchDisabled}
-                        selectedSearchContextSpec={props.selectedSearchContextSpec}
                     />
                 </div>
             </div>

client/branded/src/search-ui/input/experimental/CodeMirrorQueryInputWrapper.module.scss

@@ -1,5 +1,10 @@
 @import 'wildcard/src/global-styles/breakpoints';
 
+:root {
+    --search-box-color: var(--input-bg);
+    --search-box-border: 1px solid var(--border-color-2);
+}
+
 .container {
     width: 100%;
     position: relative;
@@ -29,8 +34,8 @@
     min-height: 32px;
     padding: 0 0.25rem;
     border-radius: 4px;
-    border: 1px solid var(--border-color-2);
-    background-color: var(--input-bg);
+    border: var(--search-box-border);
+    background-color: var(--search-box-color);
     position: relative;
 
     &:focus-within {