Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #7694 from guilleiguaran/update-ar-docs

Update AR docs to remove reference to mass assignment options
  • Loading branch information...
commit 731d8095355225a9777922c92b453b0c9c7e8e03 2 parents 2dff5dc + 533c114
@rafaelfranca rafaelfranca authored
View
11 activerecord/lib/active_record/core.rb
@@ -160,18 +160,9 @@ def relation #:nodoc:
# 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? }
View
11 activerecord/lib/active_record/persistence.rb
@@ -17,12 +17,6 @@ module ClassMethods
# # Create a single new object
# User.create(:first_name => 'Jamie')
#
- # # Create a single new object using the :admin mass-assignment security role
- # User.create({ :first_name => 'Jamie', :is_admin => true }, :as => :admin)
- #
- # # Create a single new object bypassing mass-assignment security
- # User.create({ :first_name => 'Jamie', :is_admin => true }, :without_protection => true)
- #
# # Create an Array of new objects
# User.create([{ :first_name => 'Jamie' }, { :first_name => 'Jeremy' }])
#
@@ -183,11 +177,6 @@ def update_attribute(name, value)
# Updates the attributes of the model from the passed-in hash and saves the
# record, all wrapped in a transaction. If the object is invalid, the saving
# will fail and false will be returned.
- #
- # When updating model attributes, mass-assignment security protection is respected.
- # If no +:as+ option is supplied then the +:default+ role will be used.
- # If you want to bypass the forbidden attributes protection then you can do so using
- # the +:without_protection+ option.
def update_attributes(attributes)
# The following transaction covers any possible database side-effects of the
# attributes assignment. For example, setting the IDs of a child collection.
Please sign in to comment.
Something went wrong with that request. Please try again.