aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
...
* Fix my name in the CHANGELOG to follow the conventionRafael Mendonça França2012-03-091-11/+15
| | | | Also add missing entries and use the formating convention
* update changelogs for gems without changes too [ci skip]Vijay Dev2012-03-091-0/+8
|
* In a nested resource route, the parent resource param is <resource_name>_idVijay Dev2012-03-091-8/+8
| | | | | This fix was made by @coreyhaines on docrails and merged in master. Cleanly cherry picking into 3-2-stable wasn't possible.
* Left off a : when specifying the :namespace option for a :controllercoreyhaines2012-03-091-1/+1
| | | | path segment
* Fix typo in isolated engine docsCaius Durling2012-03-091-1/+1
|
* Fix typo in asset pipeline guideMatthew Conway2012-03-091-1/+1
|
* Fixed a slightly misleading equivalent SQL code on the 3.2 query interface.Swanand Pagnis2012-03-091-1/+1
|
* typoMikhail Dieterle2012-03-091-1/+1
|
* Now all the models need to explicitly declare the accessible attributesRafael Mendonça França2012-03-041-0/+1
|
* Only add the whitelist_attributes option if ActiveRecord is presentRafael Mendonça França2012-03-043-2/+8
| | | | | | | Conflicts: railties/test/generators/app_generator_test.rb railties/test/isolation/abstract_unit.rb
* Whitelist all attribute assignment by default.Michael Koziarski2012-03-052-1/+11
| | | | Change the default for newly generated applications to whitelist all attribute assignment. Also update the generated model classes so users are reminded of the importance of attr_accessible.
* CSS fix for guides. Closing #5028 [ci skip]Vijay Dev2012-03-031-1/+1
| | | | | | | In Ubuntu Chrome, in the last lines of code blocks, the underscore isn't visible. Increasing the line height slightly seems to fix this. This problem doesn't exist in Firefox even on Ubuntu. Too lazy to test in any other OS-browser combo :)
* Merge branch '3-2-2' into 3-2-stableAaron Patterson2012-03-011-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | * 3-2-2: bumping to 3.2.2 Ensure [] respects the status of the buffer. Merge pull request #4834 from sskirby/fix_usage_of_psql_in_db_test_prepare Merge pull request #5084 from johndouthat/patch-1 updating RAILS_VERSION delete vulnerable AS::SafeBuffer#[] use AS::SafeBuffer#clone_empty for flushing the output_buffer add AS::SafeBuffer#clone_empty fix output safety issue with select options
| * bumping to 3.2.2Aaron Patterson2012-03-011-1/+1
| |
| * updating RAILS_VERSIONAaron Patterson2012-02-221-2/+2
| |
* | Removed (outdated?) config.action_view.logger from configuration guide.Victor Costan2012-02-191-3/+1
|/
* fix a typo [ci skip]Vijay Dev2012-02-181-1/+1
|
* Documenting the :inverse_of option for associationsMike Gunderloy2012-02-181-0/+99
|
* fix spacer template exampleSergey Nartimov2012-02-181-1/+1
|
* Fix that failed tests should exit with a nonzero error code.Jeremy Kemper2012-02-102-31/+17
| | | | | | Partially reverts 14c89e7285d4e7cd40a542fbc31d9345f60c3aa4. Hat tip to @tenderlove for paring down the TestTask!
* always flush all logs. fixes #4277Aaron Patterson2012-02-071-1/+1
|
* --edge option should generate app with rails 3-2-stableGuillermo Iguaran2012-02-073-4/+4
|
* Add branch to sass-rails and coffee-rails for apps generated with --dev or ↵Guillermo Iguaran2012-02-061-2/+2
| | | | --edge options (3.2.x)
* Fix plugin_new test failure from c8c84397Prem Sichanugrist2012-02-012-3/+7
| | | | | `plugin_new` generator doesn't generate `sass-rails` in the Gemfile, so you can't check for that.
* Fix GH #4749. Remove branch options, because edge is not 3-2-stable.kennyj2012-02-012-2/+7
|
* Merge pull request #4779 from bsodmike/bsodmike-3-2-stableAaron Patterson2012-01-311-1/+1
|\ | | | | Update comment in Gemfile re Unicorn (minor clarification)
| * clarification to prevent confusing newbies; Passenger/Unicorn are app ↵Michael de Silva2012-01-311-1/+1
| | | | | | | | servers, Apache/Nginx are the web servers along with thin a la Heroku etc.
* | fix assets testSergey Nartimov2012-01-311-1/+1
|/
* updating RAILS_VERSIONXavier Noria2012-01-261-1/+1
|
* CHANGELOG revision for v3.2.1Xavier Noria2012-01-261-0/+8
|
* disable automatic explain if there is no logger [closes #4671]Xavier Noria2012-01-261-0/+3
|
* Fix contributing guide to reflect preferred position on indentationbrainopia2012-01-261-1/+1
| | | | | | | | | | | Fix incorrect recommendation from indenting after private/protected to not. Based on opinions of @spastorino, @jonleighton, @tenderlove https://github.com/rails/rails/pull/1838#issuecomment-1440281 https://en.twitter.com/#!/spastorino/status/142054749351575552 https://en.twitter.com/#!/tenderlove/status/142014046445641728 https://en.twitter.com/#!/jonleighton/status/142021813415841794
* Merge pull request #4673 from carlosantoniodasilva/validation-guides-update-3-2Vijay Dev2012-01-253-16/+25
|\ | | | | Validation guides update 3 2
| * Fix callbacks order for destroying an object in validations guideCarlos Antonio da Silva2012-01-251-2/+4
| | | | | | | | | | Also add around save to creating/updating callbacks order, and fix save example with no validation
| * Improve field error proc example in validations guideCarlos Antonio da Silva2012-01-251-7/+2
| |
| * Change ActiveRecord::Errors to ActiveModel::Errors in guidesCarlos Antonio da Silva2012-01-253-5/+5
| | | | | | | | | | | | | | Use ActiveModel::Errors in inflection example docs as well. Also fixes wrong information and link to locale file related to Errors#full_messages in I18n guide.
| * Fix custom validation methods section in AR validations and callbacks guideCarlos Antonio da Silva2012-01-251-2/+14
| | | | | | | | | | | | The methods validate_on_create and validate_on_update are not available anymore in Rails, this removes them from the guide and adds an example on how to use validate with the :on option.
* | Merge pull request #4601 from carlosantoniodasilva/patch-1José Valim2012-01-231-0/+1
|\ \ | | | | | | Add missing require to Array#wrap in generators action methods
| * | Add missing require to Array#wrap in generators action methodsCarlos Antonio da Silva2012-01-221-0/+1
| | |
* | | Support decimal{1,2} and decimal{1-2} and decimal{1.2} so it works fine with ↵José Valim2012-01-222-5/+5
|/ / | | | | | | bash, zsh, etc, closes #4602
* | Fix `$rails_rake_task` global variable warning without replacing the value ↵Jonathan Viney2012-01-221-2/+1
| | | | | | | | | | | | | | | | of $rails_rake_task if it is already set. Fixes #4591. Signed-off-by: José Valim <jose.valim@gmail.com>
* | Preparing for 3.2.0 releaseDavid Heinemeier Hansson2012-01-202-2/+2
| |
* | update release notes [ci skip]Vijay Dev2012-01-201-2/+0
| |
* | add uglifier version info in the 'what to update' sectionVijay Dev2012-01-191-0/+1
| |
* | fix duplicate ids for the headers [ci skip]Vijay Dev2012-01-191-7/+7
| |
* | document AR::Base#with_lock in release notes [ci skip]Vijay Dev2012-01-191-0/+27
| |
* | update the getting_started guide code [ci skip]Vijay Dev2012-01-199-24/+57
| |
* | Merge pull request #4531 from exviva/pessimistic_with_lockAaron Patterson2012-01-191-0/+11
| | | | | | | | Add ActiveRecord::Base#with_lock
* | revising release notes [ci skip]Vijay Dev2012-01-191-2/+2
| |
* | update release note: timestamps is non-null as defaultFujimura Daisuke2012-01-191-0/+2
| |