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

Split versions.json into two files #5896

Merged
merged 1 commit into from
Mar 6, 2019
Merged

Split versions.json into two files #5896

merged 1 commit into from
Mar 6, 2019

Conversation

shilman
Copy link
Member

@shilman shilman commented Mar 6, 2019 •
edited
Loading

Issue: N/A

What I did

I'm constantly dealing with merge conflicts cherry-picking between master and next. Splitting into two files fixes that. And API is still the same since it generates versions.json on build

How to test

cd docs
yarn build
cd public && serve
open http://localhost:5000/versions.json

@shilman shilman added maintenance User-facing maintenance tasks patch:yes Bugfix & documentation PR that need to be picked to main branch labels Mar 6, 2019
@shilman shilman added this to the 5.0.x milestone Mar 6, 2019
@shilman shilman requested a review from tmeasday March 6, 2019 03:26
@shilman shilman changed the title Split versions.json into two files to avoid constant merge conflicts Split versions.json into two files Mar 6, 2019
tmeasday
tmeasday approved these changes Mar 6, 2019
View reviewed changes
Copy link
Member

@tmeasday tmeasday left a comment

Choose a reason for hiding this comment

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

LGTM

@shilman shilman merged commit 492e87d into next Mar 6, 2019
@shilman shilman deleted the split-versions-json branch March 6, 2019 03:36
shilman added a commit that referenced this pull request Mar 6, 2019
@shilman
Merge pull request #5896 from storybooks/split-versions-json
8998c58 
Split versions.json into two files
@shilman shilman added the patch:done Patch/release PRs already cherry-picked to main/release branch label Mar 7, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tmeasday tmeasday tmeasday approved these changes

@Hypnosphi Hypnosphi Awaiting requested review from Hypnosphi

@ndelangen ndelangen Awaiting requested review from ndelangen

Assignees
No one assigned
Labels
maintenance User-facing maintenance tasks patch:done Patch/release PRs already cherry-picked to main/release branch patch:yes Bugfix & documentation PR that need to be picked to main branch
Projects
None yet
Milestone
5.0.x
Development

Successfully merging this pull request may close these issues.
2 participants
@shilman @tmeasday