1. 14 1月, 2014 22 次提交
  2. 13 1月, 2014 12 次提交
  3. 12 1月, 2014 3 次提交
    • A
      Merge pull request #13668 from prathamesh-sonpatki/issue-13667 · 75c27119
      Andrew White 提交于
      Fix iterating over DateTime by doing strict checking for Time objects
      75c27119
    • A
      force table creation · c4e9dc27
      Aaron Patterson 提交于
      c4e9dc27
    • A
      Merge branch 'master' into set_binds · 11e8badb
      Aaron Patterson 提交于
      * master: (2794 commits)
        doc, API example on how to use `Model#exists?` with multiple IDs. [ci skip]
        Restore DATABASE_URL even if it's nil in connection_handler test
        [ci skip] - error_messages_for has been deprecated since 2.3.8 - lets reduce any confusion for users
        Ensure Active Record connection consistency
        Revert "ask the fixture set for the sql statements"
        Check `respond_to` before delegation due to: https://github.com/ruby/ruby/commit/d781caaf313b8649948c107bba277e5ad7307314
        Adding Hash#compact and Hash#compact! methods
        MySQL version 4.1 was EOL on December 31, 2009 We should at least recommend modern versions of MySQL to users.
        clear cache on body close so that cache remains during rendering
        add a more restricted codepath for templates fixes #13390
        refactor generator tests to use block form of Tempfile
        Fix typo [ci skip]
        Move finish_template as the last public method in the generator
        Minor typos fix [ci skip]
        make `change_column_null` reversible. Closes #13576.
        create/drop test and development databases only if RAILS_ENV is nil
        Revert "Speedup String#to"
        typo fix in test name. [ci skip].
        `core_ext/string/access.rb` test what we are documenting.
        Fix typo in image_tag documentation
        ...
      
      Conflicts:
      	activerecord/lib/active_record/associations/join_dependency/join_association.rb
      	activerecord/lib/active_record/relation/query_methods.rb
      11e8badb
  4. 11 1月, 2014 3 次提交
    • P
      1842a692
    • A
      Merge pull request #13671 from arunagw/upgrade-bundler · 4ae3da66
      Andrew White 提交于
      Removing without_thor_debug 
      4ae3da66
    • Y
      use enum labels as form values. Achieved by `_before_type_cast`. · 792c66f8
      Yves Senn 提交于
      Closes #13650, #13672
      
      This is an alternate implementation to solve #13650. Currently form fields
      contain the enum value (eg. "1"). This breaks because the setter `enum=`
      expects the label (eg. "active").
      
      ActiveRecord::Enum allows you to use labels in your application but store numbers.
      We should make sure that all parts after AR are dealing with labels and not the
      underlying mapping to a number.
      
      This patch defines `_before_type_cast` on every enum column to return the label.
      This method is later used to fetch the value to display in form fields.
      
      I deliberately copied the implementation of the enum getter instead of delegating to it.
      This allows you to overwrite the getter and for example return a `Value Object` but have it
      still work for form fields.
      792c66f8