aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/core.rb
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-09-18 19:27:00 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-09-18 19:27:00 -0700
commit731d8095355225a9777922c92b453b0c9c7e8e03 (patch)
tree009c1f0fa0c25e9a0cfd43377eecec2ac87ab7b2 /activerecord/lib/active_record/core.rb
parent2dff5dc5cbcefcb3d8f8e73d1f6a2c2f0cdbf711 (diff)
parent533c11417acd63aeb36b411b8ac0cfa5cb574ab6 (diff)
downloadrails-731d8095355225a9777922c92b453b0c9c7e8e03.tar.gz
rails-731d8095355225a9777922c92b453b0c9c7e8e03.tar.bz2
rails-731d8095355225a9777922c92b453b0c9c7e8e03.zip
Merge pull request #7694 from guilleiguaran/update-ar-docs
Update AR docs to remove reference to mass assignment options
Diffstat (limited to 'activerecord/lib/active_record/core.rb')
-rw-r--r--activerecord/lib/active_record/core.rb11
1 files changed, 1 insertions, 10 deletions
diff --git a/activerecord/lib/active_record/core.rb b/activerecord/lib/active_record/core.rb
index 8f798830d4..f97c363871 100644
--- a/activerecord/lib/active_record/core.rb
+++ b/activerecord/lib/active_record/core.rb
@@ -160,18 +160,9 @@ module ActiveRecord
# In both instances, valid attribute keys are determined by the column names of the associated table --
# hence you can't have attributes that aren't part of the table columns.
#
- # +initialize+ respects mass-assignment security and accepts either +:as+ or +:without_protection+ options
- # in the +options+ parameter.
- #
- # ==== Examples
+ # ==== Example:
# # Instantiates a single new object
# User.new(:first_name => 'Jamie')
- #
- # # Instantiates a single new object using the :admin mass-assignment security role
- # User.new({ :first_name => 'Jamie', :is_admin => true }, :as => :admin)
- #
- # # Instantiates a single new object bypassing mass-assignment security
- # User.new({ :first_name => 'Jamie', :is_admin => true }, :without_protection => true)
def initialize(attributes = nil)
defaults = self.class.column_defaults.dup
defaults.each { |k, v| defaults[k] = v.dup if v.duplicable? }