Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | refactoring | Jon Leighton | 2011-09-13 | 1 | -19/+11 |
| | |||||
* | Use an empty AttributeMethodMatcher by default. | Jon Leighton | 2011-09-13 | 2 | -2/+26 |
| | | | | | | This means that attribute methods which don't exist will get generated when define_attribute_methods is called, so we don't have to use hacks like `attribute_method_suffix ''`. | ||||
* | Alias id= if necessary, rather than relying on method_missing | Jon Leighton | 2011-09-13 | 1 | -0/+4 |
| | |||||
* | Merge pull request #2988 from guilleiguaran/remove-extra-line | Santiago Pastorino | 2011-09-12 | 1 | -1/+0 |
|\ | | | | | Remove odd asignation | ||||
| * | Remove odd asignation | Guillermo Iguaran | 2011-09-12 | 1 | -1/+0 |
|/ | |||||
* | Use the proper executable on tests. | José Valim | 2011-09-12 | 1 | -1/+1 |
| | |||||
* | Merge pull request #2985 from kennyj/master | Santiago Pastorino | 2011-09-12 | 2 | -1/+17 |
|\ | | | | | fix https://github.com/rails/rails/issues/2582 (with testcase) | ||||
| * | fix https://github.com/rails/rails/issues/2582 (with testcase) | kennyj | 2011-09-13 | 2 | -2/+18 |
| | | |||||
* | | Merge pull request #2678 from jmileham/ares_content_length_bug | Jon Leighton | 2011-09-12 | 2 | -4/+36 |
|\ \ | | | | | | | ActiveResource shouldn't rely on the presence of Content-Length | ||||
| * | | ActiveResource shouldn't rely on the presence of Content-Length | John Mileham | 2011-09-11 | 1 | -1/+9 |
| | | | |||||
| * | | Failing test: ActiveResource shouldn't rely on the presence of Content-Length | John Mileham | 2011-09-09 | 1 | -3/+27 |
| | | | |||||
* | | | Just provide the executable for railtie. This should be fine since Rubygems ↵ | José Valim | 2011-09-12 | 3 | -9/+7 |
| | | | | | | | | | | | | now warns before overriding them. | ||||
* | | | Merge pull request #2984 from jrgifford/master | Xavier Noria | 2011-09-12 | 89 | -0/+1417 |
|\ \ \ | | | | | | | | | Added getting_started application to railties/guides/code/getting_started | ||||
| * | | | Added getting_started code, updated guide with link to rails github repo and ↵ | James Gifford | 2011-09-12 | 89 | -0/+1417 |
|/ / / | | | | | | | | | | path to code | ||||
* | | | Merge pull request #2936 from joelmoss/migration_status | Santiago Pastorino | 2011-09-11 | 1 | -5/+7 |
| | | | | | | | | | | | | db:migrate:status not looking at all migration paths | ||||
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-09-11 | 4 | -10/+10 |
|\ \ \ | |||||
| * \ \ | Merge pull request #66 from hasanove/master | Emin Hasanov | 2011-09-11 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | typo in asset pipeline guide | ||||
| | * | | | Fix typo in "must-revalidate" header name | Emin Hasanov | 2011-09-11 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | Fix for :instance_reader => false code example | Andy Lindeman | 2011-09-10 | 1 | -1/+1 |
| | | | | |||||
| * | | | Revert "Fixed syntax error in "block setting of attributes" example." | Ray Baxter | 2011-09-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code and CHANGELOGS can't be edited in docrails. You'll need to make this change in rails/rails. This reverts commit 465752ba6bf2cc124dc78f4a9eb7a1d74dd8c868. | ||||
| * | | | Fixed syntax error in "block setting of attributes" example. | Erik Ostrom | 2011-09-10 | 1 | -1/+1 |
| | | | | |||||
| * | | | Update to conform to rails 3.1 generated caode | Michael P Laing | 2011-09-10 | 1 | -2/+2 |
| | | | | |||||
| * | | | Travis-ci build image should link to the rails travis ci build page rather ↵ | Jeff Dutil | 2011-09-08 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | than to the image. | ||||
| * | | | some copy-edits | Vijay Dev | 2011-09-08 | 2 | -5/+5 |
| | | | | |||||
* | | | | Merge pull request #2974 from md5/csrf_token_warning | Santiago Pastorino | 2011-09-10 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Use ensure instead of rescue | ||||
| * | | | | Use ensure instead of rescue | Mike Dillon | 2011-09-10 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #2972 from md5/master | Aaron Patterson | 2011-09-10 | 3 | -1/+19 |
|\| | | | | | | | | | | | | | | Use log.warn instead of debug for CSRF token warning | ||||
| * | | | | Fix changelog entry | Mike Dillon | 2011-09-10 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Add test for warning and CHANGELOG entry | Mike Dillon | 2011-09-10 | 2 | -0/+18 |
| | | | | | |||||
| * | | | | Change log level for CSRF token verification warning | Mike Dillon | 2011-09-10 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | clarify that documentation bugs have to be reported as Rails issues. [Closes ↵ | Xavier Noria | 2011-09-10 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | #2858] | ||||
* | | | | | Merge pull request #2970 from deepakprasanna/master | Santiago Pastorino | 2011-09-10 | 1 | -0/+25 |
|\ \ \ \ \ | | | | | | | | | | | | | Added a case to check the status of the migration after a rollback and redo. | ||||
| * | | | | | added test for db migrate:redo | Deepak Prasanna | 2011-09-10 | 1 | -0/+25 |
| |/ / / / | |||||
* | | | | | Merge pull request #2968 from arunagw/form_helper_test | Vijay Dev | 2011-09-10 | 1 | -2/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | No need to use </form> here. It's already in whole_form block | ||||
| * | | | | No need to use </form> here. It's already in whole_form block | Arun Agrawal | 2011-09-10 | 1 | -2/+1 |
|/ / / / | |||||
* | | | | Merge pull request #2957 from waseem/migration_status_tests | Santiago Pastorino | 2011-09-09 | 1 | -0/+24 |
|\ \ \ \ | | | | | | | | | | | Tests for rake db:migrate:status. | ||||
| * | | | | Tests for rake db:migrate:status. | Waseem Ahmad | 2011-09-09 | 1 | -1/+25 |
| | | | | | |||||
* | | | | | Merge pull request #2876 from alex3/patch-1 | Santiago Pastorino | 2011-09-09 | 3 | -1/+32 |
|\ \ \ \ \ | | | | | | | | | | | | | Fixed assets precompile regex | ||||
| * | | | | | Fixed assets precompile regex, now accepts Procs | Alex Yakoubian | 2011-09-08 | 3 | -1/+32 |
| | | | | | | |||||
* | | | | | | Merge pull request #2966 from arunagw/no_use_warnings_removed | Santiago Pastorino | 2011-09-09 | 2 | -3/+3 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Not used variables removed. Warnings removed. | ||||
| * | | | | | | Not used variables removed. Warnings removed. | Arun Agrawal | 2011-09-10 | 2 | -3/+3 |
|/ / / / / / | |||||
* | | | | | | railties depends on actionpack, so put actionpack in the include path | Aaron Patterson | 2011-09-09 | 1 | -1/+7 |
| | | | | | | |||||
* | | | | | | rake already ships with a ruby command | Aaron Patterson | 2011-09-09 | 1 | -2/+1 |
| | | | | | | |||||
* | | | | | | move route inspecting to an object so that we can more easily test it | Aaron Patterson | 2011-09-09 | 4 | -126/+144 |
| | | | | | | |||||
* | | | | | | Merge pull request #2960 from guilleiguaran/fix-isolated-ar-tests | Aaron Patterson | 2011-09-09 | 1 | -0/+1 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Add missing require in base_test.rb, fixes isolated test | ||||
| * | | | | | Add missing require in base_test.rb, fixes isolated test | Guillermo Iguaran | 2011-09-09 | 1 | -0/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #2956 from lawrencepit/full_messages | José Valim | 2011-09-09 | 2 | -16/+46 |
|\ \ \ \ \ | | | | | | | | | | | | | Ability to get single full error message | ||||
| * | | | | | Added test for obj.errors.as_json | Lawrence Pit | 2011-09-09 | 1 | -0/+11 |
| | | | | | | |||||
| * | | | | | Add ability to get an individual full error message + test for full_messages. | Lawrence Pit | 2011-09-09 | 2 | -16/+35 |
|/ / / / / | |||||
* | | | | | Pull up a method we only use once. | Aaron Patterson | 2011-09-08 | 1 | -5/+1 |
| | | | | |