aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge pull request #500 from cyril/patch-1Jeremy Kemper2011-10-081-2/+2
|\ \ \ \ | | | | | | | | | | Use quotes for command substitution
| * | | | 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
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inspired by dlt https://github.com/dlt/rails/commit/9e615634745dc81598e7b880d52411338d3a7a93 Closes #239. Conflicts: actionpack/CHANGELOG
* | | | 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
|\ \ \ \ | | | | | | | | | | | | | | | Closes #3261
| * | | | 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
|/ / / / | | | | | | | | | | | | development. So if Travis has exported RAILS_ENV=test, it'll be used instead of development, breaking these brittle expectations.
* | | | Skip broken asset precompilation test on Macs. Issues with NFD vs NFC ↵Jeremy Kemper2011-10-081-4/+8
| | | | | | | | | | | | | | | | normalization on the asset filename. Major red flag with asset lookups!
* | | | Don't notify IRC on every single build, just failures and first success ↵Jeremy Kemper2011-10-081-1/+4
| | | | | | | | | | | | | | | | after a string of failures
* | | | 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
| | | | | | | | | | | | | | | | a global gitignore. Remove .sass-cache since we use /tmp/sass-cache, which is already ignored.
* | | | Revert "Merge pull request #3254 from arunagw/app_gitignore_sqlnet_log"Santiago Pastorino2011-10-081-1/+0
| | | | | | | | | | | | | | | | | | | | This reverts commit bb8e0673299899c913d664c0fd3c483d8569846c, reversing changes made to 11687382db08ec1523f71e485c48d6039de25324.
* | | | Merge pull request #3254 from arunagw/app_gitignore_sqlnet_logSantiago Pastorino2011-10-081-0/+1
|\ \ \ \ | | | | | | | | | | Sqlnet should also be ignored into the app gitignore
| * | | | 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 argument
| * | | | 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!
| * | | | | 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_page
| * | | | 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.
| * | | 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
|\ \ \ \ | |/ / / |/| | |
| * | | use https for github urlVijay Dev2011-10-071-1/+1
| | | |
| * | | Correct formattingmhutchin2011-10-071-5/+1
| | | |
| * | | Replace the reference to the annotate_models plugin (unchanged since 2008) ↵mhutchin2011-10-071-1/+5
| | | | | | | | | | | | | | | | with more current annotate_models gem
| * | | More understandable warning in the local_constant_names section Dimitar Dimitrov2011-10-071-2/+2
| | | | | | | | | | | | Rewrite the warning about local_constant_names in Ruby 1.8 to make it more understandable. Word ordering fixes in the same section.
| * | | Clarifying ambiguous description of require_self in the asset pipelineclay shentrup2011-10-061-1/+1
| | | |
| * | | Merge branch 'master' of github.com:lifo/docrailsManuel Menezes de Sequeira2011-10-066-9/+65
| |\ \ \
| | * | | fix an exampleVijay Dev2011-10-061-1/+1
| | | | |
| | * | | Fix comment in AbstractController callbacksAlexey Vakhov2011-10-061-2/+2
| | | | |
| | * | | Grammar fixes for the routing guide.Hendy Tanata2011-10-061-1/+1
| | | | |
| | * | | Merge branch 'master' of github.com:lifo/docrailsRyan Bigg2011-10-061-1/+1
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of github.com:lifo/docrails: use Rails.root.join for assets guide
| | | * | | use Rails.root.join for assets guideNick Quaranto2011-10-051-1/+1
| | | | | |
| | * | | | [config guide] Show example of defining initialization hooksRyan Bigg2011-10-061-0/+19
| | | | | |
| | * | | | [config guide] mention that to_prepare hooks are called upon every request ↵Ryan Bigg2011-10-061-1/+1
| | |/ / / | | | | | | | | | | | | | | | in dev, but only once in production
| | * | | [engines guide] More explanation for 'Generating an engine'Ryan Bigg2011-10-061-2/+20
| | | | |
| | * | | [engines] Expanded 'What are engines?' and 'Generating an engine' sectionsRyan Bigg2011-10-061-2/+21
| | | | |
| * | | | Undid previous change which violated the convention regarding output (use "# ↵Manuel Menezes de Sequeira2011-10-061-13/+13
| |/ / / | | | | | | | | | | | | =>") used in these guides. Corrected typo in previous correction. (Thanks for pointing this out, vijaydev.)
| * | | Some small corrections and improvements to the text.Manuel Menezes de Sequeira2011-10-051-30/+32
| | | |
| * | | Merge branch 'master' of github.com:lifo/docrailsManuel Menezes de Sequeira2011-10-0575-247/+677
| |\ \ \
| | * | | Update Rails routing guide to mention that `redirect()` is a 301 permanent ↵Prem Sichanugrist2011-10-051-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | redirect I had to try out myself to realize that it's 301, so this should be helpful to everyone.
| * | | | Correction of code snippet tag from shell to ruby.Manuel Menezes de Sequeira2011-10-051-2/+2
| | | | |
* | | | | Merge branch 'master' of github.com:rails/railsXavier Noria2011-10-073-3/+13
|\ \ \ \ \
| * \ \ \ \ Merge pull request #3243 from mjtko/connection-pool-thread-fixSantiago Pastorino2011-10-073-3/+13
| |\ \ \ \ \ | | | | | | | | | | | | | | QueryCache/ConnectionPool thread fix (was #1670)
| | * | | | | use thread locals and an instance variable within QueryCache#BodyProxy to ↵Mark J. Titorenko2011-10-073-3/+13
| |/ / / / / | | | | | | | | | | | | | | | | | | maintain appropriate linkage with AR database connection across threads