1. 30 5月, 2014 3 次提交
    • A
      Merge branch 'master' into mapper · 295e9122
      Aaron Patterson 提交于
      * master:
        Update url to rake docs [ci skip]
        Name#model_name doesn't return a String object
        Result sets never override a model's column type
        [ci skip] Make last note show up in postgresql guide.
        Add missing `:param` option from the docs for Mapper#match [ci skip] Option discovered by @zackperdue in #14741, implemented in #5581.
        Add @senny's changed from #14741, including code font for `resources` options, and wrapped to 80 chars. [ci skip]
        Use github url for homepage of log4r [ci skip]
        Remove TODO.
        Ensure we always use instances of the adapter specific column class
        Fix indentation from 1b4b26f1 [ci skip]
        [ci skip] Improve form_helpers.md guide.
        Clear inflections after test.
        Remove unnecessary include for integration tests.
        Added documentation for the :param option for resourceful routing
      295e9122
    • A
      "controllers" should be a valid path name · 8ed1a562
      Aaron Patterson 提交于
      8ed1a562
    • Z
      Update url to rake docs [ci skip] · 4584be9b
      Zachary Scott 提交于
      4584be9b
  2. 29 5月, 2014 37 次提交