Skip to content

chore: backmerge develop into unified-desktop-gui #18566

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
Merged
merged 28 commits into from
Oct 20, 2021
Merged

chore: backmerge develop into unified-desktop-gui #18566

merged 28 commits into from
Oct 20, 2021

Conversation

lmiller1990
Copy link
Contributor

@lmiller1990 lmiller1990 commented Oct 20, 2021 •
edited
Loading

!! NO SQUASH !!

845 files changed might seem crazy but it's because of:

#16354 (752 files)
#18172 (78 files)

So it's actually correct.

DO NOT SQUASH! THIS MUST BE A NORMAL MERGE TO KEEP THE HISTORY.

BlueWinds and others added 23 commits October 11, 2021 16:19
@BlueWinds
Fix cypress_spec to run permissions test locally
0d5ff9b
@BlueWinds
Re-add root check to permissions test
3e4012a
@davidmunechika
feat(driver): Add overwrite option to Cypress.Screenshot.defaults (…
bc21574 
…#18457)
@sainthkh @flotwig
fix: revive type checker (#18172)
af472b6 
Co-authored-by: Zach Bloomquist <[email protected]>
fix: warn when the projectRoot is not writeable (#18495)
83a1f09 
closes #18485
@github-actions
chore: Update Chrome (beta) to 95.0.4638.49 (#18489)
8e3e99d 
Co-authored-by: cypress-bot[bot] <2f0651858c6e38e0+cypress-bot[bot]@users.noreply.github.com>
@flotwig
Update packages/server/lib/scaffold.js
d517793 
Co-authored-by: Zach Bloomquist <[email protected]>
Merge pull request #18445 from cypress-io/local-server-integration-te…
f4fee90 
…st-fix

fix: server cypress_spec permissions test now passes
feat: normalized signatures webpack & vite servers (#18379)
8f5308f
Merge branch 'master' into develop
a8143a8
@emilyrohrbough
chore(.gitignore): remove duplicate entry
43a8fb3
@itsAftabAlam
feat: updated README.md ,added hyperlink to cypress banner (#18519)
95f1996
@flotwig
chore(contributing): create recommended extensions.json (#18511)
214994b
@emilyrohrbough
Merge branch 'develop' into clean-up-gitignore
6be0fa4
@emilyrohrbough
Merge pull request #18512 from cypress-io/clean-up-gitignore
6c423e5
@JessicaSachs @brian-mann @flotwig
chore: move server e2e tests to system-tests (#16354)
a045e4f 
Co-authored-by: Brian Mann <[email protected]>
Co-authored-by: Zach Bloomquist <[email protected]>
Co-authored-by: Zach Bloomquist <[email protected]>
chore: Update Chrome (beta) to 95.0.4638.54
2a7578f
@emilyrohrbough
Merge pull request #18542 from cypress-io/update-chrome-stable-from-9…
28e7807 
…4.0.4606.81-beta-from-95.0.4638.49
@mohatt
fix(cypress/react): disable react-refresh for craco setups (#18517)
ea10795 
Co-authored-by: Barthélémy Ledoux <[email protected]>
@lmiller1990
merge in develop
5754b2c
@lmiller1990
merge conflicts
a967745
@lmiller1990
conflicts
a3c0d6c
@lmiller1990
update yarn lock
13cb962
@lmiller1990 lmiller1990 requested a review from a team as a code owner October 20, 2021 08:40
@cypress-bot
Copy link
Contributor

cypress-bot bot commented Oct 20, 2021

Thanks for taking the time to open a PR!

@lmiller1990 lmiller1990 requested review from mjhenkes and emilyrohrbough and removed request for a team, mjhenkes and emilyrohrbough October 20, 2021 08:40
@lmiller1990 lmiller1990 merged commit d61189e into unified-desktop-gui Oct 20, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@lmiller1990 @BlueWinds @davidmunechika @sainthkh @emilyrohrbough @itsAftabAlam @flotwig @JessicaSachs @mohatt