Permalink
Commits on Oct 30, 2012
  1. Merge pull request #6107 from gazay/make_caller_attribute_in_deprecat…

    …ion_optional
    
    Make callstack attribute optional in AS:Deprecation
    carlosantoniodasilva committed Oct 30, 2012
  2. Fix bug when Column is trying to type cast boolean values to integer.

    This can occur if the user is using :integer columns to store boolean
    values. Now we are handling the boolean values but it still raises if
    the value can't type cast to integer and is not a boolean. See #7509.
    
    Fixes #8067.
    
    Conflicts:
    	activerecord/CHANGELOG.md
    rafaelfranca committed Oct 30, 2012
Commits on Oct 29, 2012
  1. Merge pull request #8066 from cfabianski/AddTestForSerializationMethod

    Add test for code change introduced in this commit f20032f
    carlosantoniodasilva committed Oct 29, 2012
  2. Add test for code change introduced in this commit f20032f

    Ce��dric FABIANSKI committed Oct 29, 2012
  3. Merge pull request #8063 from nikitug/deprecation_caller_context

    Provide a call stack for deprecation warnings where needed.
    carlosantoniodasilva committed Oct 29, 2012
  4. Provide a call stack for deprecation warnings where needed.

    It's sometimes hard to quickly find where deprecated call was performed, especially in case of migrating between Rails versions. So this is an attempt to improve the call stack part of the warning message by providing caller explicitly.
    nikitug committed Oct 29, 2012
  5. Merge pull request #7587 from elia/fix-too-eager-loading

    Should not eager_load app/assets
    Conflicts:
    	railties/CHANGELOG.md
    rafaelfranca committed Oct 29, 2012
  6. Merge pull request #8027 from daenney/master

    Atomic.rb assumes it may chown/chmod a file but doesn't handle the EPERM error.
    fxn committed Oct 29, 2012
  7. atomicc.rb: Don't assume we may chown/chmod a file.

    Previously this code just assumed it is capable of changing the file
    ownership, both user and group. This will fail in a lot of scenario's
    unless:
    * The process is run as a superuser (root);
    * The owning user and group are already set to the user and group we're
      trying to chown to;
    * The user chown'ing only changes the group to another group it is a
      member of.
    If either of those conditions are not met the filesystem will simply
    deny the operation throwing an error.
    
    It is also not always possible to do a chmod, there might be a SELinux
    policy or another limitation preventing the user to change the file
    mode. To this end the chmod call has also been added to the rescue
    block.
    
    I've also added a little comment above the chmod command that doing a
    chmod on a file which has an ACL set will cause the ACL to be
    recalculated / modified.
    Daniele Sluijters committed Oct 25, 2012
  8. Fix the skip code.

    Checking for the constant doesn't work
    rafaelfranca committed Oct 29, 2012
  9. Merge pull request #8057 from frodsan/fix_sqlite_mutate_arg

    SQLite3Adapter#type_cast should not mutate arguments
    rafaelfranca committed Oct 29, 2012
Commits on Oct 28, 2012
  1. SQLite3Adapter#type_cast should not mutate arguments

    Stefan Rusterholz committed with Francesco Rodriguez Oct 28, 2012
  2. Merge pull request #7750 from xuanxu/none_modificating_relation_in_place

    Added ActiveRecord::Relation#none! method
    rafaelfranca committed Oct 28, 2012
  3. ActiveRecord::Relation#none! method.

    xuanxu committed with xuanxu Sep 24, 2012
  4. Merge pull request #8053 from henrik/update_columns_with_primary_key

    Unbreak update_column/update_columns for the primary key attribute.
    carlosantoniodasilva committed Oct 28, 2012
  5. Enable update_column(s) for the primary key attribute.

    Didn't work before because it updated the model-in-memory first, so the DB query couldn't find the record.
    henrik committed Oct 28, 2012
  6. Merge pull request #8046 from pmahoney/exceptions_as_flow_control

    Replace flow-control exception with explicit test.
    rafaelfranca committed Oct 28, 2012
  7. Merge pull request #8048 from senny/7761_dont_render_view_without_mai…

    …l_call
    
    Do not render views when mail() isn't called. (NullMail refactoring)
    rafaelfranca committed Oct 28, 2012
  8. Merge pull request #8047 from arunagw/json_only_in_18

    Removing JSON for other ruby
    carlosantoniodasilva committed Oct 28, 2012
  9. Merge pull request #8054 from senny/6378_create_table_raises_when_def…

    …ining_pk_column
    
    create_table raises an ArgumentError when the primary key is redefined.
    carlosantoniodasilva committed Oct 28, 2012
  10. Merge pull request #8056 from frodsan/fix_issue_missing_attribute

    AR::AttributeMethods#[] raises AM::AttributeMissingError for missing attributes
    rafaelfranca committed Oct 28, 2012
  11. AR::AttributeMethods#[] raises AM::AttributeMissingError for missing …

    …attributes.
    
    This fixes the following behaviour:
    
        class Person < ActiveRecord::Base
          belongs_to :company
        end
    
        # Before:
        person = Person.select('id').first
        person[:name]       # => nil
        person.name         # => ActiveModel::MissingAttributeError: missing_attribute: name
        person[:company_id] # => nil
        person.company      # => nil
    
        # After:
        person = Person.select('id').first
        person[:name]       # => ActiveModel::MissingAttributeError: missing_attribute: name
        person.name         # => ActiveModel::MissingAttributeError: missing_attribute: name
        person[:company_id] # => ActiveModel::MissingAttributeError: missing_attribute: company_id
        person.company      # => ActiveModel::MissingAttributeError: missing_attribute: company_id
    
    Fixes #5433.
    Francesco Rodriguez committed Oct 28, 2012
  12. Merge pull request #8052 from schneems/schneems/silence-ar-query-in-m…

    …iddleware
    
    Don't log on pending migration check
    rafaelfranca committed Oct 28, 2012
  13. Don't log on pending migration check

    Conversation from: #6665 cc/ @rafaelfranca
    schneems committed Oct 28, 2012