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

Rename appLayout prop to layout in <Admin> component #3055

Merged
merged 4 commits into from
May 19, 2019
Merged

Rename appLayout prop to layout in <Admin> component #3055

merged 4 commits into from
May 19, 2019

Conversation

kopax
Copy link
Contributor

@kopax kopax commented Mar 25, 2019 •
edited
Loading

And deprecated appLayout

Fix #2918

Dimitri Kopriwa added 3 commits March 26, 2019 04:12
feat(layout): Added prop layout and added deprecation warning to
224fb49 
appLayout

BREAKING CHANGE: the prop appLayout will be removed in favor of layout
feat(layout): Added prop layout and added deprecation warning to
a45ee22 
appLayout

BREAKING CHANGE: the prop appLayout will be removed in favor of layout

Fix #2918
Merge branch 'patch-applayout' of github.com:kopax/react-admin into p…
2940149 
…atch-applayout
@fzaninotto
Copy link
Member

Awesome! However, this should land in next rather than master, as it's a new feature. master is only for bug fixes.

@kopax kopax changed the base branch from master to next April 3, 2019 06:42
@kopax kopax changed the base branch from next to master April 3, 2019 06:44
@kopax
Copy link
Contributor Author

kopax commented Apr 3, 2019

Bugfix PRs that don't break BC should be made against master. All other PRs (new features, bugfix with BC break) should be made against next.

Nice to know, I've missed that part sorry.

I'll try to redo when IDEs will be disposed for this.

@fzaninotto
Copy link
Member

Would you mind rebasing on next?

@kopax
Copy link
Contributor Author

kopax commented May 7, 2019

I have tried and it was a mess. Not sure if I did it correctly? Perhaps you could explain how to or I can give you the perms to the branch so you can perform the rebase from your own?

@fzaninotto fzaninotto changed the base branch from master to next May 19, 2019 16:51
@fzaninotto fzaninotto merged commit 9cfe0a4 into marmelab:next May 19, 2019
@fzaninotto
Copy link
Member

Thanks!

@fzaninotto fzaninotto mentioned this pull request May 19, 2019
Closed
fzaninotto added a commit that referenced this pull request May 19, 2019
@fzaninotto
Document the appLayout prop rename in the upgrade doc
12a8139 
refs #3055
@fzaninotto fzaninotto changed the title feat(layout): added layout Rename appLayout prop to layout in <Admin> component May 19, 2019
@fzaninotto fzaninotto added this to the 3.0.0 milestone May 19, 2019
@fzaninotto fzaninotto mentioned this pull request May 19, 2019
Closed
40 tasks
@kopax kopax deleted the patch-applayout branch May 19, 2019 17:40
@kopax
Copy link
Contributor Author

kopax commented May 19, 2019

Sorry about this, I will be careful next time. Would love to know the trick with the rebase, I saw massive change between next and master and wasn't sure what to do to save the work.

@fzaninotto
Copy link
Member

I merged the changes from master to next, so the rebase became much easier. I just changed the base branch in GitHub ;)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fzaninotto fzaninotto fzaninotto approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
3.0.0
Development

Successfully merging this pull request may close these issues.
2 participants
@kopax @fzaninotto