Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into mapper | Aaron Patterson | 2014-05-29 | 22 | -73/+148 |
|\ | |||||
| * | Update url to rake docs [ci skip] | Zachary Scott | 2014-05-29 | 2 | -2/+2 |
| * | Merge pull request #15407 from ShunsukeAida/correct_model_name_example | Arthur Nogueira Neves | 2014-05-29 | 2 | -2/+2 |
| |\ | |||||
| | * | Name#model_name doesn't return a String object | ShunsukeAida | 2014-05-30 | 2 | -2/+2 |
| |/ | |||||
| * | Merge pull request #15406 from sgrif/sg-column-type-override | Rafael Mendonça França | 2014-05-29 | 3 | -1/+51 |
| |\ | |||||
| | * | Result sets never override a model's column type | Sean Griffin | 2014-05-29 | 3 | -1/+51 |
| |/ | |||||
| * | Merge pull request #15061 from tgxworld/remove_unnecessary_include | Matthew Draper | 2014-05-29 | 3 | -8/+0 |
| |\ | |||||
| | * | Remove unnecessary include for integration tests. | Guo Xiang Tan | 2014-05-11 | 3 | -8/+0 |
| * | | Merge pull request #15397 from sgrif/sg-column-class | Yves Senn | 2014-05-29 | 5 | -6/+15 |
| |\ \ | |||||
| | * | | Ensure we always use instances of the adapter specific column class | Sean Griffin | 2014-05-28 | 5 | -6/+15 |
| * | | | Merge pull request #15403 from JuanitoFatas/doc/pg-guide-note | Robin Dupret | 2014-05-29 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | [ci skip] Make last note show up in postgresql guide. | Juanito Fatas | 2014-05-29 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | Add missing `:param` option from the docs for Mapper#match [ci skip] | Zachary Scott | 2014-05-29 | 1 | -0/+6 |
| * | | | Add @senny's changed from #14741, including code font for `resources` | Zachary Scott | 2014-05-29 | 1 | -1/+4 |
| * | | | Merge branch 'master' of github.com:zackperdue/rails into zackperdue-master | Zachary Scott | 2014-05-29 | 1 | -0/+19 |
| |\ \ \ | |||||
| | * | | | Added documentation for the :param option for resourceful routing | Zack Perdue | 2014-04-14 | 1 | -0/+19 |
| * | | | | Merge pull request #15399 from tgxworld/remove_todo_router_test | Guillermo Iguaran | 2014-05-28 | 1 | -11/+1 |
| |\ \ \ \ | |||||
| | * | | | | Remove TODO. | Guo Xiang Tan | 2014-05-28 | 1 | -11/+1 |
| * | | | | | Use github url for homepage of log4r [ci skip] | Zachary Scott | 2014-05-28 | 1 | -1/+1 |
| * | | | | | Merge pull request #15384 from zuhao/refactor_actionpack_params_wrapper_test | Yves Senn | 2014-05-29 | 1 | -7/+19 |
| |\ \ \ \ \ | |||||
| | * | | | | | Clear inflections after test. | Zuhao Wan | 2014-05-28 | 1 | -7/+19 |
| * | | | | | | Fix indentation from 1b4b26f [ci skip] | Zachary Scott | 2014-05-28 | 1 | -3/+3 |
| * | | | | | | Merge pull request #15395 from JuanitoFatas/docs/form-helpers | Zachary Scott | 2014-05-28 | 1 | -31/+25 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | [ci skip] Improve form_helpers.md guide. | Juanito Fatas | 2014-05-29 | 1 | -31/+25 |
* | | | | | | | | "controllers" should be a valid path name | Aaron Patterson | 2014-05-29 | 2 | -1/+11 |
* | | | | | | | | controllers with slash names are also not supported, so we can reuse the message | Aaron Patterson | 2014-05-28 | 1 | -6/+2 |
* | | | | | | | | only validate controllers | Aaron Patterson | 2014-05-28 | 1 | -15/+17 |
* | | | | | | | | golf down a bit | Aaron Patterson | 2014-05-28 | 1 | -8/+4 |
* | | | | | | | | only error handling between controller and action is the same | Aaron Patterson | 2014-05-28 | 1 | -18/+16 |
* | | | | | | | | add a test for controllers without colons | Aaron Patterson | 2014-05-28 | 1 | -0/+10 |
* | | | | | | | | move nil check to a method that yields to a block if the value is not nil | Aaron Patterson | 2014-05-28 | 1 | -17/+16 |
* | | | | | | | | translate action / controller to the desired object | Aaron Patterson | 2014-05-28 | 1 | -12/+11 |
* | | | | | | | | only one nil check on the action variable | Aaron Patterson | 2014-05-28 | 1 | -10/+8 |
* | | | | | | | | change to case / when on types | Aaron Patterson | 2014-05-28 | 1 | -8/+7 |
* | | | | | | | | only do one nil check against the controller | Aaron Patterson | 2014-05-28 | 1 | -9/+9 |
* | | | | | | | | extract controller and action parsing to a method | Aaron Patterson | 2014-05-28 | 1 | -19/+26 |
* | | | | | | | | we don't need the call to presence. that is my present, to you! | Aaron Patterson | 2014-05-28 | 1 | -1/+1 |
* | | | | | | | | swtich to returning early if to responds to call | Aaron Patterson | 2014-05-28 | 1 | -35/+32 |
* | | | | | | | | return early if we have a valid controller name | Aaron Patterson | 2014-05-28 | 1 | -5/+5 |
* | | | | | | | | trade 2 is_a? checks for a nil check | Aaron Patterson | 2014-05-28 | 1 | -2/+4 |
* | | | | | | | | invert logic to remove nil? and exclude? checks (use ruby rather than AS when... | Aaron Patterson | 2014-05-28 | 1 | -6/+6 |
* | | | | | | | | fewer blank? calls | Aaron Patterson | 2014-05-28 | 1 | -4/+4 |
* | | | | | | | | reduce action.blank? calls | Aaron Patterson | 2014-05-28 | 1 | -4/+6 |
* | | | | | | | | reduce blank? checks | Aaron Patterson | 2014-05-28 | 1 | -4/+9 |
* | | | | | | | | extract controller checks to methods | Aaron Patterson | 2014-05-28 | 1 | -19/+26 |
* | | | | | | | | set defaults at the top so we can avoid the ||= test | Aaron Patterson | 2014-05-28 | 1 | -6/+9 |
* | | | | | | | | add a test for existing mapper functionality | Aaron Patterson | 2014-05-28 | 1 | -0/+12 |
|/ / / / / / / | |||||
* / / / / / / | add tests for argument error cases | Aaron Patterson | 2014-05-28 | 1 | -0/+27 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #15393 from tonytonyjan/patch-2 | Rafael Mendonça França | 2014-05-28 | 1 | -2/+2 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Fix documentation | 簡煒航 (Jian Weihang) | 2014-05-29 | 1 | -2/+2 |
|/ / / / / |