aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-05-1413-56/+116
|\ | | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/date_helper.rb railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt
| * [GUIDES] Changed the `LANGUAGE` variable to `GUIDES_LANGUAGE` to minimize ↵Karel Minarik2011-05-141-4/+5
| | | | | | | | conflicts with regular environment variables (eg. in Ubuntu)
| * minor correctionsVijay Dev2011-05-141-5/+5
| |
| * Link the API documentation to non-edge insteadPrem Sichanugrist2011-05-131-1/+1
| |
| * Adding guide for wrapping JSON/XML parameters, which also links to the API ↵Prem Sichanugrist2011-05-131-0/+26
| | | | | | | | | | documentation. Note that it currently links to http://edgeapi.rubyonrails.org because it's Rails 3.1 feature.
| * Prefer topic branches instead of master branch for users contributionsGuillermo Iguaran2011-05-121-5/+8
| |
| * fix spellingsVijay Dev2011-05-112-2/+2
| |
| * indentation fixesVijay Dev2011-05-111-24/+23
| |
| * Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-05-111-1/+1
| |\
| | * fix bad encoding on contributing to RoR pageDan Pickett2011-05-101-1/+1
| | |
| * | minor fix in assets usageVijay Dev2011-05-101-2/+2
| |/
| * typo fixTrent Ogren2011-05-101-1/+1
| |
| * fixes github fork urlVijay Dev2011-05-101-1/+1
| |
| * - Fixed typo in association parameters configuration (again)Sasha Gerrand2011-05-091-2/+2
| |
| * - Fixed typo in the example of a self join on a modelSasha Gerrand2011-05-091-1/+1
| |
| * - Moved foreign key parameter to correct location for self join on a model ↵Sasha Gerrand2011-05-091-2/+2
| | | | | | | | example
| * Include examples for negative ordinalize in the guideVijay Dev2011-05-091-0/+2
| |
| * improve comment in wrap_parameters templateVijay Dev2011-05-091-1/+1
| |
| * Included more details on Rails coding conventions (from LH Source Style page)Vijay Dev2011-05-081-4/+10
| |
| * remove unnecessary use of 'Example'Vijay Dev2011-05-071-6/+0
| |
| * Made language consistent with the rest of the comments in the file.Aditya Sanghi2011-05-061-2/+2
| |
| * Restore emphasis on 'application name'.Paul Morganthall2011-05-051-1/+1
| |
| * Merge branch 'master' of github.com:lifo/docrailsJason Voegele2011-05-051-1/+1
| |\
| | * Rails 3 requires the "new" command to create a new project.Paul Morganthall2011-05-051-1/+1
| | |
| * | Added info on using Ehcache as cache store.Jason Voegele2011-05-051-1/+30
| |/
* | Fixed failing tests for namespaced_generators_test. in 1.9.2Arun Agrawal2011-05-141-1/+5
| |
* | asking the user whether he is "offline" rather than "online" seems more ↵Xavier Noria2011-05-141-1/+1
| | | | | | | | natural as reaction to a potential missing network connection
* | removes now unused method Rails::Generators::AppBase#dev_or_edge?Xavier Noria2011-05-141-4/+0
| |
* | application and plugin generation run bundle install unless --skip-gemfile ↵Xavier Noria2011-05-143-7/+18
| | | | | | | | or --skip-bundle
* | Update Mailer generator to use 1.9 styled hash when run on Ruby 1.9Prem Sichanugrist2011-05-132-4/+26
| | | | | | | | As always, you can run `--old-style-hash` to override that.
* | Merge pull request #542 from guilleiguaran/1_9_hash_styleJosé Valim2011-05-131-1/+1
|\ \ | | | | | | Use new hash syntax in wrap_parameters initializer under Ruby 1.9
| * | Using new hash syntax in wrap_parameters initializer under Ruby 1.9Guillermo Iguaran2011-05-131-1/+1
| | |
* | | move bundler loading down to #bundle_commandXavier Noria2011-05-131-2/+3
| | |
* | | run bundler programmatically rather than shelling outXavier Noria2011-05-131-7/+3
| | |
* | | Test added for getting route segment valuesArun Agrawal2011-05-131-0/+28
|/ /
* | use #quietly in a few places, and s/silence/capture/ where intention is captureXavier Noria2011-05-132-12/+12
| |
* | eliminating the noiseAkira Matsuda2011-05-131-1/+0
| |
* | new reporting method Kernel#quietlyXavier Noria2011-05-133-3/+11
| |
* | silences stderr to prevent an expected error message in the test suite from ↵Xavier Noria2011-05-131-2/+1
| | | | | | | | being echoed
* | say something when running bundle commandsXavier Noria2011-05-131-0/+2
| | | | | | | | | | | | This is convenient because we buffer stdout. In particular bundle install takes a while and generation just hangs there with no indication of what's going on otherwise.
* | say silence when you mean silenceXavier Noria2011-05-131-1/+1
| |
* | application and plugin generation run bundle check unless --skip-gemfileXavier Noria2011-05-136-15/+37
| | | | | | | | | | | | | | The purpose of this feature is that the user knows whether dependencies are satisfied. In particular, if they are not he will be warned upfront, rather than finding out himself in an abrupt way by trying to run something.
* | removes duplicate testsXavier Noria2011-05-131-13/+0
| |
* | Merge pull request #532 from amatsuda/update_scriptJosé Valim2011-05-121-4/+14
|\ \ | | | | | | Revert "Delegate everything to the generator"
| * | Revert "Delegate everything to the generator"Akira Matsuda2011-05-131-4/+14
| | | | | | | | | | | | | | | | | | This reverts commit 0904e8256864239f673bf91fce1cfffb9345ee61. reason: rake rails:update:scripts fails due to this change
* | | Merge pull request #531 from amatsuda/update_javascriptsJosé Valim2011-05-121-7/+2
|\ \ \ | | | | | | | | remove update:javascripts rake task
| * | | remove update:javascripts rake taskAkira Matsuda2011-05-131-7/+2
| |/ / | | | | | | | | | because javascript libraries are not bundled anymore, and create_javascript_files generator was already removed
* / / The new release supposedly fixed things, but it is still b0rked -- comment ↵David Heinemeier Hansson2011-05-121-1/+1
|/ / | | | | | | out for now pending JPs investigation into whats up
* | Proper fixDavid Heinemeier Hansson2011-05-121-1/+1
| |
* | Fix the assets regexp for non-js/css filesDavid Heinemeier Hansson2011-05-121-1/+1
| |