Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #67 from alanzeino/master | Vijay Dev | 2011-09-12 | 1 | -2/+2 |
|\ | | | | | 'Getting Started' guide typo fix | ||||
| * | Slight change to reflect current 'destroy' code generated by scaffold in 3.1 ↵ | Alan Zeino | 2011-09-12 | 1 | -2/+2 |
| | | | | | | | | release. | ||||
* | | Delete contribute.textile now that its contents are merged to the ↵ | Vijay Dev | 2011-09-12 | 1 | -70/+0 |
| | | | | | | | | contributing_to_ruby_on_rails guide | ||||
* | | change GH issue tracker url | Vijay Dev | 2011-09-12 | 1 | -1/+1 |
| | | |||||
* | | getting_started.textile: Fix typos in section "Rendering a Partial Form" | dharmatech | 2011-09-12 | 1 | -1/+1 |
| | | |||||
* | | Fix a typo in date | Semyon Perepelitsa | 2011-09-12 | 1 | -1/+1 |
|/ | |||||
* | merged the contribution guides and changed the | Vijay Dev | 2011-09-11 | 2 | -5/+7 |
| | | | | link in the layout accordingly | ||||
* | 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 |
| | | | |||||
* | | | Conditions must never be equal | Aaron Patterson | 2011-09-08 | 1 | -6/+1 |
| | | | |||||
* | | | Merge pull request #2757 from andmej/first_or_create_pull_request | Jon Leighton | 2011-09-08 | 6 | -7/+277 |
|\ \ \ | | | | | | | | | Add first_or_create family of methods to Active Record | ||||
| * | | | Using more precise method signatures for AR::Relation#first_or_create family ↵ | Andrés Mejía | 2011-09-06 | 1 | -6/+6 |
| | | | | | | | | | | | | | | | | of methods. | ||||
| * | | | Adding first example with no arguments to AR::Relation#first_or_create and ↵ | Andrés Mejía | 2011-09-06 | 1 | -15/+15 |
| | | | | | | | | | | | | | | | | removing examples that create several users at the same time (this is confusing and not really helpful). | ||||
| * | | | Adding `first_or_new` documentation to the AR Querying guide. | Nicolas Hock Isaza | 2011-08-30 | 1 | -1/+1 |
| | | | | |||||
| * | | | Adding first_or_create, first_or_create!, first_or_new and first_or_build to ↵ | Andrés Mejía | 2011-08-30 | 6 | -7/+277 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Active Record. This let's you write things like: User.where(:first_name => "Scarlett").first_or_create!(:last_name => "Johansson", :hot => true) Related to #2420. | ||||
* | | | | Remove failing test which was wrongly introduced. | Jon Leighton | 2011-09-08 | 1 | -5/+0 |
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test was introduced in pull request #2577. The author of the pull request included the test, which was originally in #2230, at the same time as fixing a separate (but related) bug. However, the author did not include a fix for this test, so when #2577 was merged, a failing test was introduced. So I am removing the failing test for now. If anyone wants to fix the bug, please do so and submit a complete pull request with a test and a fix. | ||||
* | | | revert the changes from c60995f3 - related to marking sub,gsub as ↵ | Vijay Dev | 2011-09-09 | 1 | -20/+1 |
| | | | | | | | | | | | | unavailable to use with safe strings |