Permalink
Commits on Oct 26, 2013
  1. Merge pull request #12655 from rails/ps-remove-surprise-if-in-show-ex…

    …ception-middleware
    
    Remove surprise if from show_exception middleware
    spastorino committed Oct 26, 2013
  2. Remove surprise if from show_exception middleware

    This increase the readability within the rescue block.
    sikachu committed Oct 26, 2013
Commits on Oct 25, 2013
  1. Merge pull request #12648 from chrisledet/patch-1

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

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

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

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

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

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

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

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

    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.
    senny committed Oct 10, 2013
  10. `stored_attributes` need to be specific to a subclass.

    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]
    ```
    senny committed Oct 10, 2013
  11. Merge pull request #12621 from laurocaetano/fix_has_one_association_w…

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

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

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

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

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

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

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

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

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

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

    timsly committed Oct 24, 2013