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.

Sign up for GitHub

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

Jump to bottom

chore: Rebase against upstream #337

Merged
merged 34 commits into from Mar 18, 2024
Merged

chore: Rebase against upstream #337

merged 34 commits into from Mar 18, 2024

Conversation

RomanNikitenko
Copy link
Contributor

@RomanNikitenko RomanNikitenko commented Mar 18, 2024 •
edited

What does this PR do?

Rebase against the upstream

What issues does this PR fix?

eclipse-che/che#22846

How to test this PR?

  • the jobs should be green
  • testing of any use cases is useful as we pick up a lot of commits from the upstream

Does this PR contain changes that override default upstream Code-OSS behavior?

  • the PR contains changes in the code folder (you can skip it if your changes are placed in a che extension )
  • the corresponding items were added to the CHANGELOG.md file
  • rules for automatic git rebase were added to the .rebase folder

NriotHrreion and others added 30 commits February 19, 2024 09:27
@NriotHrreion
fix #205353
2270961
@NriotHrreion
Merge branch 'microsoft:main' into fix-205353
c2107b1
@NriotHrreion
Merge branch 'main' into fix-205353
168b87d
@NriotHrreion
Merge branch 'main' into fix-205353
d57ae45
@NriotHrreion
Merge branch 'main' into fix-205353
c44cd7d
@NriotHrreion
Merge branch 'main' into fix-205353
b5088fd
@NriotHrreion
Merge branch 'main' into fix-205353
4e374d2
@NriotHrreion
Merge branch 'main' into fix-205353
fd0ffd7
@Tyriar
Exit early when object is disposed
ef1836b 
Fixes #206116
@Tyriar
Merge remote-tracking branch 'origin/main' into pr/NriotHrreion/205502
1cc9ae4
@Tyriar
Merge pull request #206123 from microsoft/tyriar/dispose
2eb1380 
Exit early when object is disposed
@aeschli @oakaigh
Configure web server base path (#202491)
45e763b 
* add support for custom root URL path through command line option `--route-base-url-path`

* fix CI/CD errors

* refine path joining in `RemoteAuthoritiesImpl`

* revert changes to `.gitignore`

* avoid RemotePaths global

* polish. Option is now called `server-base-path`

* revert uri changes

* remove unnecessary file

* remove unnecessary new line

* revert address port change

---------

Co-authored-by: sysadmin <>
Co-authored-by: Jared C <28533997+oakaigh@users.noreply.github.com>
Co-authored-by: sysadmin <sysadmin@homelab-hvac>
@meganrogge
fix #204395
9854e10
@Tyriar
Preview selected detected link
e6132ea 
Fixes #206126
@Tyriar
Merge pull request #206129 from microsoft/tyriar/link_preview
8a64f0f 
Preview selected detected link
@vinistock
Fix accidental dedent for in and when dedent in Ruby comments
228a35f
@Tyriar
Merge pull request #205502 from NriotHrreion/fix-205353
1e07343 
Fix the unexpected position of hover widgets
@meganrogge
fix #203722
c43cd02
@meganrogge
Merge pull request #206128 from microsoft/merogge/acc-view-fix
283d747 
fix issue with accessible view on windows
@meganrogge
simplify
db5fbe6
@meganrogge
Merge pull request #206135 from microsoft/merogge/link-view
b06b876 
enable link activation for SR users in accessible view
@rebornix
Merge pull request #206132 from vinistock/vs/fix_in_dedent_in_comments
250466a 
Fix accidental dedent for `in` and `when` dedent in Ruby comments
@connor4312
cli: ensure the canonical snap exe is used for the CLI (#206133)
9a07ceb 
Fixes #204907
@connor4312
debug: fix loading state in triggered bp widget (#206140)
4700215 
Fixes #204699
@mjbvz
Fix sharing copy paste data across editor groups (#206142)
d63202a 
Fix sharing copy paste data across editor groups
@benibenj
Adopt custom hover for extension and runtime view (#206154)
660264a 
adopt custom hover for extension and runtime view
@Tyriar
Only preview detected links for files and when preview is on
f10dd69 
Part of #206126
@Tyriar
Simplify setting selection
523dd89
@Tyriar
Merge pull request #206164 from microsoft/tyriar/polish_preview
e8b9685 
Only preview detected links for files and when preview is on
@benibenj
Adopt custom hover for inline chat widget (#206170)
d2f3406 
inline chat custom hover adoption
benibenj and others added 3 commits February 26, 2024 02:20
@benibenj
Updated actionViewItemProvider to include options parameter (#206188)
03f6a78 
Updated actionViewItemProvider to include options parameter in various components
@ulugbekna
rename suggestions: fix width overflow
13a2ba8
@RomanNikitenko
Rebase against the upstream 13a2ba8
8758935 
vscode-upstream-sha1: 13a2ba8

rh-pre-commit.version: 2.2.0
rh-pre-commit.check-secrets: ENABLED
@github-actions GitHub Actions
Copy link

github-actions bot commented Mar 18, 2024 •
edited

Click here to review and test in web IDE: Contribute

@github-actions GitHub Actions
Copy link

Pull Request Dev image published:
👉 quay.io/che-incubator-pull-requests/che-code-dev:pr-337-dev-amd64

@github-actions GitHub Actions
Copy link

Pull Request Che-Code image published:
👉 quay.io/che-incubator-pull-requests/che-code:pr-337-amd64

@github-actions GitHub Actions
Copy link

Pull Request Dev image published:
👉 quay.io/che-incubator-pull-requests/che-code-dev:pr-337-dev-amd64

@RomanNikitenko
Update ./rebase/changelog file
458194e 
Signed-off-by: Roman Nikitenko <rnikiten@redhat.com>

rh-pre-commit.version: 2.2.0
rh-pre-commit.check-secrets: ENABLED
@github-actions GitHub Actions
Copy link

Pull Request Dev image published:
👉 quay.io/che-incubator-pull-requests/che-code-dev:pr-337-dev-amd64

@RomanNikitenko RomanNikitenko marked this pull request as ready for review March 18, 2024 14:43
azatsarynnyy
azatsarynnyy approved these changes Mar 18, 2024
View reviewed changes
Copy link
Member

@azatsarynnyy azatsarynnyy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you @RomanNikitenko for fixing those incompatibilities with the upstream!

@github-actions GitHub Actions
Copy link

Pull Request Che-Code image published:
👉 quay.io/che-incubator-pull-requests/che-code:pr-337-amd64

1 similar comment
@github-actions GitHub Actions
Copy link

Pull Request Che-Code image published:
👉 quay.io/che-incubator-pull-requests/che-code:pr-337-amd64

@RomanNikitenko RomanNikitenko merged commit 4c59d22 into main Mar 18, 2024
7 checks passed
@RomanNikitenko RomanNikitenko deleted the resolve_conflicts branch March 18, 2024 16:54
@RomanNikitenko RomanNikitenko mentioned this pull request Mar 19, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@azatsarynnyy azatsarynnyy azatsarynnyy approved these changes

@vitaliy-guliy vitaliy-guliy vitaliy-guliy approved these changes

@l0rd l0rd Awaiting requested review from l0rd

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone