Commit Graph

14 Commits

Author SHA1 Message Date
Tyler Biethman 8a9713fc0d Chore: Merge branch 'develop' of https://github.com/cypress-io/cypress into 10.0-release
# Conflicts:
#	npm/vite-dev-server/src/makeCypressPlugin.ts
#	npm/vite-dev-server/src/resolveServerConfig.ts
#	npm/vue/README.md
#	npm/webpack-dev-server/package.json
#	packages/driver/cypress/integration/commands/actions/type_spec.js
#	packages/driver/src/cy/commands/navigation.ts
2022-02-10 12:11:42 -06:00
Zach Bloomquist 74456fe68a chore: update automerge workflows (#19982)
Co-authored-by: Emily Rohrbough <emilyrohrbough@users.noreply.github.com>
2022-02-03 19:57:12 +00:00
Zach Bloomquist 993553944e chore(workflows): merge develop into 10.0-release on push (#19760) 2022-01-20 10:22:51 -06:00
Barthélémy Ledoux 30d0b3328d ci: fix merge master into develop failure (#16815) 2021-06-04 17:56:02 -05:00
Chris Breiding d20cb93b4d chore: Check for and update tested-against Chrome versions (#16549) 2021-05-19 11:13:54 -04:00
Jennifer Shehane 0c14687bc9 chore: Remove GitHub actions to sync issues/PRs to Jira (#16150) 2021-04-27 10:28:04 -05:00
Zach Panzarino 0e73ab3bd8 build: fix errors with merge master -> develop gh action (#15141) 2021-02-18 14:23:38 -05:00
Zach Panzarino a99ec16387 build: use official github api for merge action (#15136) 2021-02-18 13:35:49 -05:00
Jennifer Shehane ab570bb78d chore: Jira workflow labels update (#14862) 2021-02-02 14:43:58 +06:30
Jennifer Shehane ae8668b5bf chore: Add workflow to create Jira issues (#14793) 2021-02-02 13:22:18 +06:30
Zach Panzarino 0a8e38ed20 build: fix semantic release git plugin and remove accidentally committed node_modules (#8850) 2020-10-15 14:13:42 -04:00
Zach Panzarino 09d95c2836 fix: set correct committer for gh action merge commit (#8774) 2020-10-08 15:55:36 -04:00
Zach Panzarino 4533767543 fix: issues with monorepo tools (#8687) 2020-09-29 19:24:15 -04:00
Jessica Sachs 59ceab5e8c chore: merge branch 'develop' (#8665) 2020-09-24 19:16:11 -04:00