Skip to content

Commit

Permalink
Suppress docker-on-mac message unless it's a single container deploym…
Browse files Browse the repository at this point in the history
…ent (#28821)

* Suppress docker-on-mac message unless it's a single container deployment

* Update CHANGELOG for message suppression

* Linter: must use single quotes

* Prettier-ify
  • Loading branch information
Kevin Wojkovich committed Dec 14, 2021
1 parent d8f4cdd commit 9576665
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Expand Up @@ -30,6 +30,7 @@ All notable changes to Sourcegraph are documented in this file.

- Moving a changeset from draft state into published state was broken on GitLab code hosts. [#28239](https://github.com/sourcegraph/sourcegraph/pull/28239)
- The shortcuts for toggling the History Panel and Line Wrap were not working on Mac. [#28574](https://github.com/sourcegraph/sourcegraph/pull/28574)
- Suppresses docker-on-mac warning for Kubernetes, Docker Compose, and Pure Docker deployments. [#28405](https://github.com/sourcegraph/sourcegraph/pull/28821)
- Fixed an issue where certain regexp syntax for repository searches caused the entire search, including non-repository searches, to fail with a parse error (issue affects only version 3.34). [#28826](https://github.com/sourcegraph/sourcegraph/pull/28826)

### Removed
Expand Down
4 changes: 3 additions & 1 deletion client/web/src/global/GlobalAlerts.tsx
Expand Up @@ -64,7 +64,9 @@ export class GlobalAlerts extends React.PureComponent<Props, State> {
/>
)}
{/* Only show if the user has already added repositories; if not yet, the user wouldn't experience any Docker for Mac perf issues anyway. */}
{window.context.likelyDockerOnMac && <DockerForMacAlert className={styles.alert} />}
{window.context.likelyDockerOnMac && window.context.deployType === 'docker-container' && (
<DockerForMacAlert className={styles.alert} />
)}
{window.context.sourcegraphDotComMode && (
<CodeHostScopeAlerts authenticatedUser={this.props.authenticatedUser} />
)}
Expand Down

0 comments on commit 9576665

Please sign in to comment.