aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add ActionController#head exampleAlexey Vakhov2011-10-111-0/+2
|
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-10-104-26/+245
|\
| * [engines guide] add TODO for RedCarpet exampleRyan Bigg2011-10-101-1/+1
| |
| * [engines guide] cover generating the comment resourceRyan Bigg2011-10-101-2/+84
| |
| * Fix rails/generators/base.rb documentation for generator lookupRyan Bigg2011-10-101-3/+3
| |
| * [engines guide] amend two TODOs for further things in this guideRyan Bigg2011-10-101-1/+2
| |
| * [engines guide] finish covering what the scaffold generator does within an ↵Ryan Bigg2011-10-101-2/+42
| | | | | | | | engine
| * [engines guide] final line changeRyan Bigg2011-10-101-1/+2
| |
| * [engines guide] Add TODO for mentioning rails s and rails cRyan Bigg2011-10-101-0/+2
| |
| * [engines guide] begin explaining what the scaffold generator outputs within ↵Ryan Bigg2011-10-101-2/+56
| | | | | | | | an engine
| * [engines guide] reword first two dot points in prologueRyan Bigg2011-10-101-2/+2
| |
| * [engines guide] Credit where credit is due + explaning directory structureRyan Bigg2011-10-101-3/+40
| |
| * [engines guide] Credit where credit is dueRyan Bigg2011-10-101-0/+2
| |
| * Copy editing to improve readability, consistency, and tonemhutchin2011-10-091-4/+4
| |
| * Minor copy editingmhutchin2011-10-091-1/+1
| |
| * Merge pull request #70 from mcdd/masterGuillermo Iguaran2011-10-091-2/+2
| |\ | | | | | | Update security guide ActiveRecordStore/SessionStore
| | * ActiveRecordStore is now called SessionStore.Dan McDonald2011-10-091-2/+2
| | |
| * | Copy editing: s/Rails guesses/Rails assumes/gmhutchin2011-10-091-7/+7
| |/
* | Merge pull request #3274 from arunagw/warning_removed_mysql2Vijay Dev2011-10-101-2/+2
|\ \ | | | | | | ambiguous first argument; put parentheses or even spaces Warning removed!
| * | ambiguous first argument; put parentheses or even spaces Warning removed!Arun Agrawal2011-10-101-2/+2
| | |
* | | Merge pull request #3265 from arunagw/warning_uri_parserVijay Dev2011-10-101-1/+1
|\ \ \ | | | | | | | | URI.escape is obsolete : warning removed
| * | | URI.escape is obsolete : warning removedArun Agrawal2011-10-091-1/+1
| | | |
* | | | Merge pull request #3275 from simi/patch-1José Valim2011-10-101-7/+8
|\ \ \ \ | | | | | | | | | | Improve ActiveRecord changelog
| * | | | Active Record changelog mistakesJosef Šimánek2011-10-101-7/+8
|/ / / /
* | | | Merge pull request #3272 from odorcicd/fix_json_error_rootJosé Valim2011-10-102-1/+35
|\ \ \ \ | |_|/ / |/| | | JSON responder should return errors with :errors root
| * | | JSON responder should return errors with :error rootDenis Odorcic2011-10-102-1/+35
|/ / /
* | | Use broken YAML that will fail with Syck as well as Psych. Fixes ↵Jon Leighton2011-10-091-2/+2
| | | | | | | | | | | | | | | | | | test_broken_yaml_exception in fixtures_test.rb on Ruby 1.8.7. Cherry-pick from 3-1-stable: b8d46924e70e0847e92e1d2dbaaec8c11381072c
* | | Remove stray whitespaceJeremy Kemper2011-10-091-4/+1
| | |
* | | Only use LOWER for mysql case insensitive uniqueness check when column has a ↵Joseph Palermo2011-10-0910-12/+139
| | | | | | | | | | | | case sensitive collation.
* | | Merge pull request #3270 from kennyj/fix_invalid_regexSantiago Pastorino2011-10-091-1/+1
|\ \ \ | |_|/ |/| | (small patch) fix invalid regex in testcase
| * | fix invalid regexkennyj2011-10-101-1/+1
|/ /
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-10-095-18/+84
|\ \
| * | Corrections to the ajax guide recent changes. This guide is veryVijay Dev2011-10-091-32/+26
| | | | | | | | | | | | outdated and will need a lot of changes to make it useful for Rails 3+
| * | Fix a typo that was mysteriously entered in previous commitRoy Tomeij2011-10-091-1/+1
| | |
| * | Add note about how Sass & Sprockets don't matchRoy Tomeij2011-10-091-1/+3
| | |
| * | Copy editing to improve readability and remove any potential ambiguitymhutchin2011-10-091-8/+8
| | |
| * | improving the docs for ajax_on_railsKarunakar (Ruby)2011-10-091-13/+22
| | |
| * | copy editingmhutchin2011-10-081-3/+3
| | |
| * | copy editingmhutchin2011-10-081-1/+1
| | |
| * | Revert "Revert "updated the ajax_on_rails.textile for rails3" because of ↵Karunakar (Ruby)2011-10-091-4/+65
| | | | | | | | | | | | | | | | | | invalid git user" This reverts commit 5d2ffbb992b4ab875a121761fc0cf14dcaa12033.
| * | copy editingmhutchin2011-10-091-1/+1
| | | | | | | | | | | | "updated the ajax_on_rails.textile for rails3"
| * | Correct stylesheet filename and remove reference to old stylesheet ↵mhutchin2011-10-081-1/+1
| | | | | | | | | | | | compilation location
| * | Fix params hash example in AC::Base commentAlexey Vakhov2011-10-081-1/+1
| | |
* | | Merge pull request #3266 from arunagw/warnings_removedSantiago Pastorino2011-10-093-3/+3
|\ \ \ | |_|/ |/| | Warnings removed when running with 1.9.3
| * | Warnings removed when running with 1.9.3Arun Agrawal2011-10-093-3/+3
|/ /
* | Merge pull request #3262 from subdigital/masterJosé Valim2011-10-092-3/+26
|\ \ | | | | | | Add optional host option to force_ssl
| * | accept optional :host parameter to force_sslBen Scheirman2011-10-082-3/+26
| | |
* | | Merge pull request #3196 from avakhov/patch-am-av-tests-2José Valim2011-10-094-2/+58
|\ \ \ | | | | | | | | Improve tests method for ActionView::TestCase and ActionMailer::TestCase
| * | | normalize arg for ActionView::TestCase tests methodAlexey Vakhov2011-10-032-1/+22
| | | |
| * | | normalize arg for ActionMailer::TestCase tests methodAlexey Vakhov2011-10-032-1/+36
| | | |