Skip to content
Commits on May 2, 2013
  1. @fxn
  2. @fxn
  3. @carlosantoniodasilva

    Merge pull request #10426 from tkrajcar/rescue-h1-fix

    Add styling to h1 for default rescue layout
    carlosantoniodasilva committed May 2, 2013
  4. @rafaelfranca

    Merge pull request #10423 from wangjohn/refactoring_testing_rakefile

    Refactoring the creation of TestTasks to remove code duplication.
    rafaelfranca committed May 2, 2013
  5. @tkrajcar

    Add styling to h1

    tkrajcar committed May 2, 2013
  6. @wangjohn
  7. @carlosantoniodasilva

    Merge pull request #10416 from tkhr/add-test-for-AR--Base#to_param

    Add test for `AR::Base#to_param`
    carlosantoniodasilva committed May 2, 2013
  8. @take

    Add test for `AR::Base#to_param`

    According to the doc of `AR::Base#to_param`(
    https://github.com/rails/rails/blob/04cda1848cb847c2bdad0bfc12160dc8d554
    7775/activerecord/lib/active_record/integration.rb#L18 ), it returns
    `nil` if the record is not persisted.
    take committed May 2, 2013
  9. @carlosantoniodasilva
  10. @fxn

    Merge pull request #10414 from eiel/fix_dependency

    Fixes Dependency bug in Active Support
    fxn committed May 2, 2013
  11. @eiel

    Fixes Dependency bug in Active Support

    DateTime defined in date.rb
    eiel committed May 2, 2013
  12. @vipulnsward

    Fix typo in test

    vipulnsward committed May 2, 2013
  13. @carlosantoniodasilva
  14. @carlosantoniodasilva
  15. @carlosantoniodasilva

    Merge pull request #10396 from tkhr/extract-test-code-from-base_test.rb

    Extract tests code out from AR's base_test.rb to integration_test.rb
    carlosantoniodasilva committed May 1, 2013
  16. @take

    Extract tests code out from AR's base_test.rb to integration_test.rb

    `AR::Base#to_param` and `AR::Base#cache_key` is defined at
    active_record/integration.rb, so tests for those methods should be at
    integration_test.rb
    take committed May 2, 2013
  17. @rafaelfranca

    Merge pull request #10408 from patricksrobertson/convert_activemodel_…

    …to_new_hash_syntax
    
    Convert ActiveModel to 1.9 hash syntax.
    rafaelfranca committed May 1, 2013
  18. @patricksrobertson

    Convert ActiveModel to 1.9 hash syntax.

    I also attempted to fix other styleguide violations such as
    { a: :b } over {a: :b} and foo(b: 'bar') over foo( b: 'bar' ).
    patricksrobertson committed May 1, 2013
  19. @tenderlove

    Merge pull request #7839 from chancancode/handle_aliased_attributes_i…

    …n_ar_relation
    
    Handle aliased attributes in AR::Relation
    tenderlove committed May 1, 2013
  20. @carlosantoniodasilva
  21. @carlosantoniodasilva

    Merge pull request #10407 from NARKOZ/encoding-constant

    Use constant for encoding
    carlosantoniodasilva committed May 1, 2013
Commits on May 1, 2013
  1. @NARKOZ

    use constant for encoding

    NARKOZ committed May 2, 2013
  2. @chancancode

    Handle aliased attributes in ActiveRecord::Relation.

    When using symbol keys, ActiveRecord will now translate aliased attribute names to the actual column name used in the database:
    
    With the model
    
      class Topic
        alias_attribute :heading, :title
      end
    
    The call
    
      Topic.where(heading: 'The First Topic')
    
    should yield the same result as
    
      Topic.where(title: 'The First Topic')
    
    This also applies to ActiveRecord::Relation::Calculations calls such as `Model.sum(:aliased)` and `Model.pluck(:aliased)`.
    
    This will not work with SQL fragment strings like `Model.sum('DISTINCT aliased')`.
    
    Github #7839
    
    *Godfrey Chan*
    chancancode committed May 1, 2013
  3. @rafaelfranca

    Merge pull request #10404 from chadmoone/fix-pg-uuid-default

    Allow override of PostgreSQL UUID primary key default
    rafaelfranca committed May 1, 2013
  4. @chadmoone

    allow override of uuid_generate_v4() default by passing default: nil

    without this, it's not possible to use UUID primary keys without uuid-ossp installed and activated
    chadmoone committed Apr 25, 2013
  5. @guilleiguaran

    Merge pull request #10405 from rubys/410-beta

    Make railties version match RAILS_VERSION
    guilleiguaran committed May 1, 2013
  6. @rubys
  7. @guilleiguaran

    Merge pull request #10394 from BMorearty/remove-varargs-from-in

    Remove varargs from `Object#in?`
    guilleiguaran committed May 1, 2013
  8. @carlosantoniodasilva
  9. @BMorearty
  10. @fxn

    Revert "Consistent use of code syntax formatting for boolean values"

    Same rationale as previous revert.
    
    This reverts commit 887225e.
    fxn committed May 1, 2013
  11. @fxn

    Revert "Correct formatting for remaining booleans"

    It is not in the contract that flags have to be singletons,
    the use of regular font indicates that.
    
    This reverts commit 80036f9.
    fxn committed May 1, 2013
  12. @BMorearty

    Revert "Object#in? also accepts multiple parameters"

    This reverts commit ebf69ab.
    
    `in?` must not take multiple parameters because its behavior would be
    ambiguous:
    
        # Test if "B" is included in a list of names with `"B".in?(*names)`:
        names = ["BMorearty"]
        "B".in?(*names)   # => true
    
        names = ["BMorearty","rubyduo"]
        "B".in?(*names)   # => false
    
    Conflicts:
    	activesupport/lib/active_support/core_ext/object/inclusion.rb
    	activesupport/test/core_ext/object/inclusion_test.rb
    BMorearty committed May 1, 2013
  13. @vijaydev
  14. @vijaydev

    copy edits [ci skip]

    vijaydev committed May 1, 2013
Something went wrong with that request. Please try again.