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

Tech/ci example overhaul clean #10702

Merged
merged 36 commits into from
May 19, 2020
Merged

Tech/ci example overhaul clean #10702

merged 36 commits into from
May 19, 2020

Conversation

tooppaaa
Copy link
Contributor

@tooppaaa tooppaaa commented May 9, 2020

What I did

Rearange commits of #10447

tooppaaa and others added 12 commits May 18, 2020 13:26
# Conflicts:
#	examples/angular-cli/jest.config.js
#	lib/cli/src/generators/HTML/index.js
#	lib/cli/src/generators/HTML/template-csf/stories/0-Welcome.stories.js
#	yarn.lock
…js/storybook into tech/ci-example-overhaul-clean

# Conflicts:
#	examples/angular-cli/jest.config.js
#	yarn.lock
…js/storybook into tech/ci-example-overhaul-clean

# Conflicts:
#	examples/angular-cli/jest.config.js
# Conflicts:
#	lib/cli/src/helpers.ts
#	yarn.lock
@ndelangen ndelangen marked this pull request as ready for review May 18, 2020 18:51
@ndelangen ndelangen added the maintenance User-facing maintenance tasks label May 18, 2020
@ndelangen ndelangen added this to the 6.0 milestone May 18, 2020
@tooppaaa tooppaaa merged commit 8fd3ca6 into next May 19, 2020
@tooppaaa tooppaaa deleted the tech/ci-example-overhaul-clean branch May 19, 2020 10:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
maintenance User-facing maintenance tasks
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants