Permalink
Commits on Oct 25, 2013
  1. Merge pull request #12648 from chrisledet/patch-1

    rafaelfranca committed Oct 25, 2013
    Fixed typo with after_commit docs
  2. Fixed typo with after_commit docs

    chrisledet committed Oct 25, 2013
    Fixed syntax error on `after_commit` docs
  3. Merge pull request #12643 from severin/pg_cast_json_on_write

    senny committed Oct 25, 2013
    cast json values on write to be consistent with reading from the db.
  4. only warn on leaked time zone state instead of rasing an error.

    senny committed Oct 25, 2013
    Raising `RuntimeErrors` skips important cleanup code and leads to
    a lot of subsequent errors. This clutters the test output with a lot
    of noise.
  5. Merge pull request #12633 from senny/no_more_time_zone_leaks

    senny committed Oct 25, 2013
    prevent global timezone state from leaking out of test cases.
  6. Merge pull request #12642 from ka8725/fix_usage_for_model_generators

    rafaelfranca committed Oct 25, 2013
    Improve usage example for model generator decimal field
  7. Merge pull request #12641 from jetthoughts/12640_updated_migrations_d…

    rafaelfranca committed Oct 25, 2013
    …oc_to_use_remove_column
    
    Fix migration docs to use new remove_column  semantics
  8. Merge pull request #12490 from senny/store_accessor_hstore_bug

    senny committed Oct 25, 2013
    ActiveRecord Store works with PG `hstore` columns
  9. `ActiveRecord::Store` works together with PG `hstore` columns.

    senny committed Oct 10, 2013
    This is necessary because as of 5ac2341 `hstore` columns are always stored
    as `Hash` with `String` keys. `ActiveRecord::Store` expected the attribute to
    be an instance of `HashWithIndifferentAccess`, which led to the bug.
  10. `stored_attributes` need to be specific to a subclass.

    senny committed Oct 10, 2013
    Currently they are all stored globally in the same `Hash`.
    This commit forces the creation of a per-class variable if necessary.
    
    The behavior was exposed through the following test-case:
    
    ```
      1) Failure:
    StoreTest#test_all_stored_attributes_are_returned [/Users/senny/Projects/rails/activerecord/test/cases/store_test.rb:151]:
    --- expected
    +++ actual
    @@ -1 +1 @@
    -[:color, :homepage, :favorite_food]
    +[:resolution, :color, :homepage, :favorite_food]
    ```
  11. Merge pull request #12621 from laurocaetano/fix_has_one_association_w…

    rafaelfranca committed Oct 25, 2013
    …ith_primary_key_set
    
    Save association when primary key is manually set
    
    Conflicts:
    	activerecord/CHANGELOG.md
Commits on Oct 24, 2013
  1. Merge pull request #12636 from kongregate/dont_rescue_Exceptions

    rafaelfranca committed Oct 24, 2013
    Avoid unnecessary catching of Exception instead of StandardError (conver...
  2. Avoid unnecessary catching of Exception instead of StandardError (con…

    stopdropandrew committed Oct 24, 2013
    …verting Exceptions into StandardErrors)
  3. Improve the test code for #8422

    rafaelfranca committed Oct 24, 2013
    * Remove unneeded comments.
    * Use key? instead of keys.include?.
  4. Merge pull request #12632 from al2o3cr/fix_race_for_attribute_methods

    tenderlove committed Oct 24, 2013
    Always check to see if methods exist after calling define_attribute_methods
  5. Merge pull request #12635 from mperham/4-0-stable

    guilleiguaran committed with rafaelfranca Oct 24, 2013
    Allow any version of BCrypt
  6. Merge pull request #10471 from andyw8/button_to_params

    rafaelfranca committed Oct 24, 2013
    Add params option for button_to
    
    Conflicts:
    	actionpack/CHANGELOG.md
  7. Merge pull request #12611 from antonio/slice_bang_honor_default_proc

    rafaelfranca committed Oct 24, 2013
    Make slice! honor default hash value/proc
  8. Merge pull request #12624 from timsly/master

    rafaelfranca committed Oct 24, 2013
    update CHANGELOG
  9. Merge pull request #12629 from Peeja/has_many-pets-typo

    guilleiguaran committed Oct 24, 2013
    Fix typo: `has_many :pets`, not `pets :has_many`.
  10. update CHANGELOG

    timsly committed Oct 24, 2013
  11. Merge pull request #12622 from timsly/helpers-from-outside

    guilleiguaran committed Oct 24, 2013
    pass app config to controller helper proxy