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

ssh remoting: Show error if opening connection timed out #18401

Merged
merged 4 commits into from
Sep 27, 2024

Conversation

mrnugget
Copy link
Member

This shows an error if opening a connection to a remote host didn't work in the timeout of 10s (maybe we'll need to make that configurable in the future? for now it seems fine.)

screenshot-2024-09-26-18 01 07@2x

Release Notes:

  • N/A

This shows an error if opening a connection to a remote host didn't work
in the timeout of 10s (maybe we'll need to make that configurable in the
future? for now it seems fine.)

Co-authored-by: Bennet <bennet@zed.dev>
Co-authored-by: Conrad <conrad@zed.dev>
@cla-bot cla-bot bot added the cla-signed The user has signed the Contributor License Agreement label Sep 26, 2024
@mrnugget
Copy link
Member Author

cc @danilo-leal this "design" might need some work. we're also unsure whether we should add a "reconnect" button or a "close" button or something like that. For "reconnect" we also need to figure out first whether we can do that from here or not. Or maybe we should have a button that goes "back" to the recent projects modal? etc. Appreciate your input.

@mrnugget mrnugget merged commit 5199135 into main Sep 27, 2024
9 checks passed
@mrnugget mrnugget deleted the ssh-connect-error branch September 27, 2024 07:31
schpet added a commit to schpet/zed that referenced this pull request Oct 3, 2024
* upstream/main: (33 commits)
  Fine-tune hunk control spacing (zed-industries#18463)
  Add tooltip for code actions icon button (zed-industries#18461)
  More git hunk highlighting fixes (zed-industries#18459)
  Move git hunk controls to the left side (zed-industries#18460)
  Capitalize tooltip labels on buffer search (zed-industries#18458)
  Install cargo-edito without extra features (zed-industries#18457)
  Fix bugs in diff hunk highlighting (zed-industries#18454)
  Remove Qwen2 model (zed-industries#18444)
  vim: Command selection fixes (zed-industries#18424)
  Add a `get-release-notes-since` script (zed-industries#18445)
  Fix GoToDefinition changing the viewport unnecessarily (zed-industries#18441)
  docs: Ollama api_url improvements (zed-industries#18440)
  Fix missing tooltips for selected buttons (zed-industries#18435)
  Add missing shortcuts in tooltips (zed-industries#18282)
  assistant: Fix copy/cut not working when selection is empty (zed-industries#18403)
  Fix the numeration in line wrap docs (zed-industries#18428)
  ssh remoting: Show error if opening connection timed out (zed-industries#18401)
  project: Fix worktree store event missing in remote projects (zed-industries#18376)
  Fix read timeout for ollama (zed-industries#18417)
  vim: Support za (zed-industries#18421)
  ...
noaccOS pushed a commit to noaccOS/zed that referenced this pull request Oct 19, 2024
…ies#18401)

This shows an error if opening a connection to a remote host didn't work
in the timeout of 10s (maybe we'll need to make that configurable in the
future? for now it seems fine.)

![screenshot-2024-09-26-18 01
07@2x](https://github.com/user-attachments/assets/cbfa0e9f-9c29-4b6c-bade-07fdd7393c9d)


Release Notes:

- N/A

---------

Co-authored-by: Bennet <bennet@zed.dev>
Co-authored-by: Conrad <conrad@zed.dev>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla-signed The user has signed the Contributor License Agreement
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant