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

Update changelogs with rails 3.0-stable branch info #4023

Merged
merged 1 commit into from
Feb 25, 2012
Merged

Update changelogs with rails 3.0-stable branch info #4023

merged 1 commit into from
Feb 25, 2012

Conversation

pacoguzman
Copy link
Contributor

No description provided.

@fxn
Copy link
Member

fxn commented Dec 18, 2011

/cc @tenderlove

@arunagw
Copy link
Member

arunagw commented Feb 25, 2012

@pacoguzman you need a rebase. I think there are some file changes already done.

@pacoguzman
Copy link
Contributor Author

@arunagw I'd rebased my commit and forced it, I'd collected all the changelogs of the 3-2, 3-1 and 3-0 branches

@fxn
Copy link
Member

fxn commented Feb 25, 2012

The way we maintain CHANGELOGs across branches is not very good, it is a manual procedure not assisted by git. But until we find a better policy for CHANGELOGs these patches are welcome. Thanks a lot Paco.

fxn added a commit that referenced this pull request Feb 25, 2012
Update changelogs with rails 3.0-stable branch info
@fxn fxn merged commit 5196c07 into rails:master Feb 25, 2012
@pacoguzman
Copy link
Contributor Author

@fxn we talked about it already. You're welcome

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants