Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 5 commits into from Dec 14, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Expand Up @@ -28,6 +28,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