aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Minor copy editingmhutchin2011-10-091-1/+1
* Merge pull request #70 from mcdd/masterGuillermo Iguaran2011-10-091-2/+2
|\
| * ActiveRecordStore is now called SessionStore.Dan McDonald2011-10-091-2/+2
* | Copy editing: s/Rails guesses/Rails assumes/gmhutchin2011-10-091-7/+7
|/
* 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
| * 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 inva...Karunakar (Ruby)2011-10-091-4/+65
| * copy editingmhutchin2011-10-091-1/+1
| * Correct stylesheet filename and remove reference to old stylesheet compilatio...mhutchin2011-10-081-1/+1
| * 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.3Arun Agrawal2011-10-093-3/+3
|/ /
* | Merge pull request #3262 from subdigital/masterJosé Valim2011-10-092-3/+26
|\ \
| * | 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
|\ \ \
| * | | normalize arg for ActionView::TestCase tests methodAlexey Vakhov2011-10-032-1/+22
| * | | normalize arg for ActionMailer::TestCase tests methodAlexey Vakhov2011-10-032-1/+36
* | | | Merge pull request #500 from cyril/patch-1Jeremy Kemper2011-10-081-2/+2
|\ \ \ \
| * | | | Use quotes for command substitutionCyril Wack2011-05-101-2/+2
* | | | | Fixes an issue when creating a date select with too many options.Liborio Cannici2011-10-083-5/+25
| |_|/ / |/| | |
* | | | Isolate rake action tests that should be run under default envGuillermo Iguaran2011-10-081-4/+8
* | | | Merge remote-tracking branch 'guilleiguaran/test-utf8-assets-filename'Jeremy Kemper2011-10-081-8/+4
|\ \ \ \
| * | | | Test utf8 assets filenames with request instead of manifest lookupGuillermo Iguaran2011-10-081-8/+4
* | | | | The generator invokes rake with either the :env option, ENV['RAILS_ENV'], or ...Jeremy Kemper2011-10-081-3/+5
|/ / / /
* | | | Skip broken asset precompilation test on Macs. Issues with NFD vs NFC normali...Jeremy Kemper2011-10-081-4/+8
* | | | Don't notify IRC on every single build, just failures and first success after...Jeremy Kemper2011-10-081-1/+4
* | | | Disable 1.9.3 builds until upgraded from -preview1 to -rc1Jeremy Kemper2011-10-081-1/+1
* | | | Add comments to our generated .gitignore, including a note about when to use ...Jeremy Kemper2011-10-081-5/+15
* | | | Revert "Merge pull request #3254 from arunagw/app_gitignore_sqlnet_log"Santiago Pastorino2011-10-081-1/+0
* | | | Merge pull request #3254 from arunagw/app_gitignore_sqlnet_logSantiago Pastorino2011-10-081-0/+1
|\ \ \ \
| * | | | Sqlnet should also be ignored into the app gitignoreArun Agrawal2011-10-081-0/+1
|/ / / /
* | | | Merge pull request #3249 from arunagw/query_cache_test_fixJosé Valim2011-10-081-1/+1
|\ \ \ \
| * | | | Fixed BodyProxy.new for tests! for wrong argumentArun Agrawal2011-10-081-1/+1
* | | | | Merge pull request #3250 from arunagw/adding_sqlnet_to_gitignoreJosé Valim2011-10-081-0/+1
|\ \ \ \ \
| * | | | | sqlnet.log file to gitignore. Generates when running with oracle! Arun Agrawal2011-10-081-0/+1
| |/ / / /
* | | | | Merge pull request #3252 from avakhov/p-remove-expire_page-dupJosé Valim2011-10-081-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Remove unnecessary dup in expire_pageAlexey Vakhov2011-10-081-1/+1
|/ / / /
* | | | just check to see that the first item in the list is an arrayAaron Patterson2011-10-072-1/+10
* | | | fix bad formatting in the assets guideVijay Dev2011-10-081-1/+1
* | | | testing.rake should set the default task, closes #2564José Valim2011-10-072-2/+2
* | | | closes #3241 - partial doc fixVijay Dev2011-10-072-3/+3
* | | | Merge pull request #3244 from ugisozols/masterVijay Dev2011-10-071-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | One of the activemodel naming tests wasn't asserting anything.Uģis Ozols2011-10-071-1/+1
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-10-0710-43/+103
|\ \ \ \ | |/ / / |/| | |