Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | forgot to sign my name to the Changelog | Dallas Reedy | 2011-09-14 | 1 | -1/+1 |
| | |||||
* | Removed mention of deprecated proxy methods in favor of using proxy_association. | Dallas Reedy | 2011-09-14 | 1 | -4/+5 |
| | |||||
* | remove info about guides hackfest | Vijay Dev | 2011-09-14 | 1 | -1/+0 |
| | |||||
* | Add equivalent nginx configuration | Ben Walding | 2011-09-14 | 1 | -1/+15 |
| | |||||
* | Fix typos and broken link on asset pipeline guide | Jaime Iniesta | 2011-09-14 | 1 | -3/+3 |
| | |||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-09-13 | 6 | -82/+14 |
|\ | |||||
| * | Fixed markup error. | 45north | 2011-09-13 | 1 | -1/+1 |
| | | |||||
| * | Fix typo | Mike Gunderloy | 2011-09-13 | 1 | -1/+1 |
| | | |||||
| * | getting_started.textile: Fix typo and split up a sentence in section ↵ | dharmatech | 2011-09-12 | 1 | -2/+2 |
| | | | | | | | | "Building a Multi-Model Form" | ||||
| * | 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 |
| |/ | |||||
| * | merged the contribution guides and changed the | Vijay Dev | 2011-09-11 | 2 | -5/+7 |
| | | | | | | | | link in the layout accordingly | ||||
* | | Fix precompile asset_host test | Guillermo Iguaran | 2011-09-13 | 1 | -1/+1 |
| | | |||||
* | | Move asset tests to assets_test file | Guillermo Iguaran | 2011-09-13 | 2 | -31/+31 |
| | | |||||
* | | fixed the failing generators_test | Deepak Prasanna | 2011-09-13 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #2987 from kennyj/master | Santiago Pastorino | 2011-09-12 | 1 | -0/+16 |
|\ \ | | | | | | | fix https://github.com/rails/rails/issues/2947 (with testcase) | ||||
| * | | fix https://github.com/rails/rails/issues/2947 (with testcase) | kennyj | 2011-09-13 | 1 | -0/+16 |
| | | | |||||
* | | | point rails at Journey for dev and edge | Aaron Patterson | 2011-09-12 | 2 | -0/+3 |
| | | | |||||
* | | | adjust route inspection to work with Journey | Aaron Patterson | 2011-09-12 | 1 | -1/+2 |
| | | | |||||
* | | | 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 | 1 | -0/+16 |
|\| | | | | | | | | fix https://github.com/rails/rails/issues/2582 (with testcase) | ||||
| * | | fix https://github.com/rails/rails/issues/2582 (with testcase) | kennyj | 2011-09-13 | 1 | -1/+17 |
| | | | |||||
* | | | Just provide the executable for railtie. This should be fine since Rubygems ↵ | José Valim | 2011-09-12 | 1 | -1/+6 |
| | | | | | | | | | | | | now warns before overriding them. | ||||
* | | | 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 branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-09-11 | 3 | -9/+9 |
|\ \ | |||||
| * | | 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 |
| | | | |||||
| * | | Update to conform to rails 3.1 generated caode | Michael P Laing | 2011-09-10 | 1 | -2/+2 |
| | | | |||||
| * | | some copy-edits | Vijay Dev | 2011-09-08 | 2 | -5/+5 |
| | | | |||||
* | | | clarify that documentation bugs have to be reported as Rails issues. [Closes ↵ | Xavier Noria | 2011-09-10 | 1 | -0/+4 |
| | | | | | | | | | | | | #2858] | ||||
* | | | added test for db migrate:redo | Deepak Prasanna | 2011-09-10 | 1 | -0/+25 |
| | | | |||||
* | | | 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 | 2 | -1/+30 |
|\ \ \ \ | | | | | | | | | | | Fixed assets precompile regex | ||||
| * | | | | Fixed assets precompile regex, now accepts Procs | Alex Yakoubian | 2011-09-08 | 2 | -1/+30 |
| | |/ / | |/| | | |||||
* | | | | 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 #2757 from andmej/first_or_create_pull_request | Jon Leighton | 2011-09-08 | 1 | -7/+68 |
|\ \ \ | | | | | | | | | Add first_or_create family of methods to Active Record | ||||
| * | | | 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 | 1 | -7/+68 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-09-08 | 4 | -26/+54 |
|\ \ \ | |||||
| * | | | getting_started.textile section 6: Correct file names in table | dharmatech | 2011-09-07 | 1 | -3/+3 |
| | | | | |||||
| * | | | Revert "Rails.root is a Pathname, no need to use File.join first." | Vijay Dev | 2011-09-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 760fd1eb42038a64591036fc5d687afc98f272aa. Reason: We need a fully qualified path string here, not a Pathname. | ||||
| * | | | copy edit assets guide | Vijay Dev | 2011-09-07 | 1 | -19/+19 |
| | | | | |||||
| * | | | getting_started.textile: Fix another typo | dharmatech | 2011-09-07 | 1 | -1/+1 |
| | | | |