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

Rename property to attribute #15558

Merged
merged 1 commit into from
Jun 7, 2014
Merged

Conversation

sgrif
Copy link
Contributor

@sgrif sgrif commented Jun 7, 2014

For consistency with #15546

@rafaelfranca rafaelfranca merged commit 3fab9d8 into rails:master Jun 7, 2014
rafaelfranca added a commit that referenced this pull request Jun 7, 2014
Rename `property` to `attribute`

Conflicts:
	activerecord/lib/active_record/attribute_methods/serialization.rb
	activerecord/lib/active_record/base.rb
kuldeepaggarwal added a commit to kuldeepaggarwal/rails that referenced this pull request Jun 7, 2014
@kuldeepaggarwal
Copy link
Contributor

@rafaelfranca I think we should wait for travis build. wdyt?

@rafaelfranca
Copy link
Member

@kuldeepaggarwal I think it is fine. If the tests break I'll fix anyway.

rafaelfranca added a commit that referenced this pull request Jun 7, 2014
fix test cases after #15558 merge to master.
@sgrif sgrif deleted the sg-rename-property branch June 14, 2014 01:18
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.

None yet

3 participants