aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #67 from alanzeino/masterVijay Dev2011-09-121-2/+2
|\ | | | | 'Getting Started' guide typo fix
| * Slight change to reflect current 'destroy' code generated by scaffold in 3.1 ↵Alan Zeino2011-09-121-2/+2
| | | | | | | | release.
* | Delete contribute.textile now that its contents are merged to the ↵Vijay Dev2011-09-121-70/+0
| | | | | | | | contributing_to_ruby_on_rails guide
* | change GH issue tracker urlVijay Dev2011-09-121-1/+1
| |
* | getting_started.textile: Fix typos in section "Rendering a Partial Form"dharmatech2011-09-121-1/+1
| |
* | Fix a typo in dateSemyon Perepelitsa2011-09-121-1/+1
|/
* merged the contribution guides and changed theVijay Dev2011-09-112-5/+7
| | | | link in the layout accordingly
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-09-114-10/+10
|\
| * Merge pull request #66 from hasanove/masterEmin Hasanov2011-09-111-1/+1
| |\ | | | | | | typo in asset pipeline guide
| | * Fix typo in "must-revalidate" header nameEmin Hasanov2011-09-111-1/+1
| |/
| * Fix for :instance_reader => false code exampleAndy Lindeman2011-09-101-1/+1
| |
| * Revert "Fixed syntax error in "block setting of attributes" example."Ray Baxter2011-09-101-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 Ostrom2011-09-101-1/+1
| |
| * Update to conform to rails 3.1 generated caodeMichael P Laing2011-09-101-2/+2
| |
| * Travis-ci build image should link to the rails travis ci build page rather ↵Jeff Dutil2011-09-081-1/+1
| | | | | | | | than to the image.
| * some copy-editsVijay Dev2011-09-082-5/+5
| |
* | Merge pull request #2974 from md5/csrf_token_warningSantiago Pastorino2011-09-101-1/+1
|\ \ | | | | | | Use ensure instead of rescue
| * | Use ensure instead of rescueMike Dillon2011-09-101-1/+1
| | |
* | | Merge pull request #2972 from md5/masterAaron Patterson2011-09-103-1/+19
|\| | | | | | | | Use log.warn instead of debug for CSRF token warning
| * | Fix changelog entryMike Dillon2011-09-101-1/+1
| | |
| * | Add test for warning and CHANGELOG entryMike Dillon2011-09-102-0/+18
| | |
| * | Change log level for CSRF token verification warningMike Dillon2011-09-101-1/+1
| | |
* | | clarify that documentation bugs have to be reported as Rails issues. [Closes ↵Xavier Noria2011-09-101-0/+4
| | | | | | | | | | | | #2858]
* | | Merge pull request #2970 from deepakprasanna/masterSantiago Pastorino2011-09-101-0/+25
|\ \ \ | | | | | | | | Added a case to check the status of the migration after a rollback and redo.
| * | | added test for db migrate:redoDeepak Prasanna2011-09-101-0/+25
| |/ /
* | | Merge pull request #2968 from arunagw/form_helper_testVijay Dev2011-09-101-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 blockArun Agrawal2011-09-101-2/+1
|/ /
* | Merge pull request #2957 from waseem/migration_status_testsSantiago Pastorino2011-09-091-0/+24
|\ \ | | | | | | Tests for rake db:migrate:status.
| * | Tests for rake db:migrate:status.Waseem Ahmad2011-09-091-1/+25
| | |
* | | Merge pull request #2876 from alex3/patch-1Santiago Pastorino2011-09-093-1/+32
|\ \ \ | | | | | | | | Fixed assets precompile regex
| * | | Fixed assets precompile regex, now accepts ProcsAlex Yakoubian2011-09-083-1/+32
| | | |
* | | | Merge pull request #2966 from arunagw/no_use_warnings_removedSantiago Pastorino2011-09-092-3/+3
|\ \ \ \ | | | | | | | | | | Not used variables removed. Warnings removed.
| * | | | Not used variables removed. Warnings removed.Arun Agrawal2011-09-102-3/+3
|/ / / /
* | | | railties depends on actionpack, so put actionpack in the include pathAaron Patterson2011-09-091-1/+7
| | | |
* | | | rake already ships with a ruby commandAaron Patterson2011-09-091-2/+1
| | | |
* | | | move route inspecting to an object so that we can more easily test itAaron Patterson2011-09-094-126/+144
| | | |
* | | | Merge pull request #2960 from guilleiguaran/fix-isolated-ar-testsAaron Patterson2011-09-091-0/+1
|\ \ \ \ | |_|/ / |/| | | Add missing require in base_test.rb, fixes isolated test
| * | | Add missing require in base_test.rb, fixes isolated testGuillermo Iguaran2011-09-091-0/+1
|/ / /
* | | Merge pull request #2956 from lawrencepit/full_messagesJosé Valim2011-09-092-16/+46
|\ \ \ | | | | | | | | Ability to get single full error message
| * | | Added test for obj.errors.as_jsonLawrence Pit2011-09-091-0/+11
| | | |
| * | | Add ability to get an individual full error message + test for full_messages.Lawrence Pit2011-09-092-16/+35
|/ / /
* | | Pull up a method we only use once.Aaron Patterson2011-09-081-5/+1
| | |
* | | Conditions must never be equalAaron Patterson2011-09-081-6/+1
| | |
* | | Merge pull request #2757 from andmej/first_or_create_pull_requestJon Leighton2011-09-086-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ía2011-09-061-6/+6
| | | | | | | | | | | | | | | | of methods.
| * | | Adding first example with no arguments to AR::Relation#first_or_create and ↵Andrés Mejía2011-09-061-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 Isaza2011-08-301-1/+1
| | | |
| * | | Adding first_or_create, first_or_create!, first_or_new and first_or_build to ↵Andrés Mejía2011-08-306-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 Leighton2011-09-081-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 Dev2011-09-091-20/+1
| | | | | | | | | | | | unavailable to use with safe strings