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

Fix an automatic rebase against the upstream #257

Merged
merged 151 commits into from
Jul 11, 2023
Merged

Fix an automatic rebase against the upstream #257

merged 151 commits into from
Jul 11, 2023

Conversation

azatsarynnyy
Copy link
Member

@azatsarynnyy azatsarynnyy commented Jul 11, 2023

What does this PR do?

Fixes an auto-rebase against the upstream.

What issues does this PR fix?

closes eclipse-che/che#22351

How to test this PR?

Pull Request Check / build ... PR status checks must be green.

ssigwart and others added 30 commits June 4, 2022 23:55
* #180695 - adopt atomic write for userdata

* check if fsp has atomic write

* fix tests
The fast process spawn, kill, spawn was causing problems on remotes

Fixes #187084
* testing: fix default size of inline peek diff

Fixes #185331

* rm unused import
…ce (#187092)

To start the migration process, we have `getCurrentAuthenticationSessionInfo` take in a `secretStorageService` and also replaces the `LocalStorageCredentialProvider` with a `LocalStorageSecretStorageProvider`.

After this goes in we can then update all embedders (vscode.dev, github.dev, Codespaces, vscode-web-test?) and replace ICredentialProvider usages with ISecretStorageProviders and then once we do that, we can get rid of a bunch of code!
* Show progress bar in remote indicator when initializing

* Remove placeholder change
Bumps [semver](https://github.com/npm/node-semver) from 7.3.5 to 7.5.3.
- [Release notes](https://github.com/npm/node-semver/releases)
- [Changelog](https://github.com/npm/node-semver/blob/main/CHANGELOG.md)
- [Commits](npm/node-semver@v7.3.5...v7.5.3)

---
updated-dependencies:
- dependency-name: semver
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
mjbvz and others added 18 commits July 10, 2023 13:03
For #187234

Got introduced through a bad PR change. Makes more sense to move this styling to the css file instead
* add missing sinon restore calls

* use `teardown(() => sinon.restore())` in search tests to restore stubs
* making markdown link pasting feature smarter

* Update settings description

Co-authored-by: Joyce Er <joyceerhl@gmail.com>

* made checkPaste more concise

* won't paste md link in fenced code or math

---------

Co-authored-by: Joyce Er <joyceerhl@gmail.com>
check if there are any glob tasks before getting them from the workspace
* Repopulate slash command in chat input editor
always wait for all supported executions or timeout
@github-actions
Copy link

github-actions bot commented Jul 11, 2023

Click here to review and test in web IDE: Contribute

Signed-off-by: Artem Zatsarynnyi <azatsary@redhat.com>
@github-actions
Copy link

Pull Request images published ✨
image: quay.io/che-incubator-pull-requests/che-code:pr-257-amd64
Dev image: quay.io/che-incubator-pull-requests/che-code-dev:pr-257-dev-amd64

@azatsarynnyy azatsarynnyy marked this pull request as ready for review July 11, 2023 13:16
@azatsarynnyy azatsarynnyy changed the title [WIP] Fix an automatic rebase against the upstream Fix an automatic rebase against the upstream Jul 11, 2023
@azatsarynnyy azatsarynnyy merged commit 50dc79d into main Jul 11, 2023
1 of 2 checks passed
@azatsarynnyy azatsarynnyy deleted the fix-rebase branch July 11, 2023 14:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Che-Code automatic rebase against upstream VS Code is failed