Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge branch '3-2-2' into 3-2-stable | Aaron Patterson | 2012-03-01 | 1 | -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.2 | Aaron Patterson | 2012-03-01 | 1 | -1/+1 | |
| | | ||||||
| * | updating RAILS_VERSION | Aaron Patterson | 2012-02-22 | 1 | -2/+2 | |
| | | ||||||
* | | Removed (outdated?) config.action_view.logger from configuration guide. | Victor Costan | 2012-02-19 | 1 | -3/+1 | |
|/ | ||||||
* | fix a typo [ci skip] | Vijay Dev | 2012-02-18 | 1 | -1/+1 | |
| | ||||||
* | Documenting the :inverse_of option for associations | Mike Gunderloy | 2012-02-18 | 1 | -0/+99 | |
| | ||||||
* | fix spacer template example | Sergey Nartimov | 2012-02-18 | 1 | -1/+1 | |
| | ||||||
* | Fix that failed tests should exit with a nonzero error code. | Jeremy Kemper | 2012-02-10 | 2 | -31/+17 | |
| | | | | | | Partially reverts 14c89e7285d4e7cd40a542fbc31d9345f60c3aa4. Hat tip to @tenderlove for paring down the TestTask! | |||||
* | always flush all logs. fixes #4277 | Aaron Patterson | 2012-02-07 | 1 | -1/+1 | |
| | ||||||
* | --edge option should generate app with rails 3-2-stable | Guillermo Iguaran | 2012-02-07 | 3 | -4/+4 | |
| | ||||||
* | Add branch to sass-rails and coffee-rails for apps generated with --dev or ↵ | Guillermo Iguaran | 2012-02-06 | 1 | -2/+2 | |
| | | | | --edge options (3.2.x) | |||||
* | Fix plugin_new test failure from c8c84397 | Prem Sichanugrist | 2012-02-01 | 2 | -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. | kennyj | 2012-02-01 | 2 | -2/+7 | |
| | ||||||
* | Merge pull request #4779 from bsodmike/bsodmike-3-2-stable | Aaron Patterson | 2012-01-31 | 1 | -1/+1 | |
|\ | | | | | Update comment in Gemfile re Unicorn (minor clarification) | |||||
| * | clarification to prevent confusing newbies; Passenger/Unicorn are app ↵ | Michael de Silva | 2012-01-31 | 1 | -1/+1 | |
| | | | | | | | | servers, Apache/Nginx are the web servers along with thin a la Heroku etc. | |||||
* | | fix assets test | Sergey Nartimov | 2012-01-31 | 1 | -1/+1 | |
|/ | ||||||
* | updating RAILS_VERSION | Xavier Noria | 2012-01-26 | 1 | -1/+1 | |
| | ||||||
* | CHANGELOG revision for v3.2.1 | Xavier Noria | 2012-01-26 | 1 | -0/+8 | |
| | ||||||
* | disable automatic explain if there is no logger [closes #4671] | Xavier Noria | 2012-01-26 | 1 | -0/+3 | |
| | ||||||
* | Fix contributing guide to reflect preferred position on indentation | brainopia | 2012-01-26 | 1 | -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-2 | Vijay Dev | 2012-01-25 | 3 | -16/+25 | |
|\ | | | | | Validation guides update 3 2 | |||||
| * | Fix callbacks order for destroying an object in validations guide | Carlos Antonio da Silva | 2012-01-25 | 1 | -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 guide | Carlos Antonio da Silva | 2012-01-25 | 1 | -7/+2 | |
| | | ||||||
| * | Change ActiveRecord::Errors to ActiveModel::Errors in guides | Carlos Antonio da Silva | 2012-01-25 | 3 | -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 guide | Carlos Antonio da Silva | 2012-01-25 | 1 | -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-1 | José Valim | 2012-01-23 | 1 | -0/+1 | |
|\ \ | | | | | | | Add missing require to Array#wrap in generators action methods | |||||
| * | | Add missing require to Array#wrap in generators action methods | Carlos Antonio da Silva | 2012-01-22 | 1 | -0/+1 | |
| | | | ||||||
* | | | Support decimal{1,2} and decimal{1-2} and decimal{1.2} so it works fine with ↵ | José Valim | 2012-01-22 | 2 | -5/+5 | |
|/ / | | | | | | | bash, zsh, etc, closes #4602 | |||||
* | | Fix `$rails_rake_task` global variable warning without replacing the value ↵ | Jonathan Viney | 2012-01-22 | 1 | -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 release | David Heinemeier Hansson | 2012-01-20 | 2 | -2/+2 | |
| | | ||||||
* | | update release notes [ci skip] | Vijay Dev | 2012-01-20 | 1 | -2/+0 | |
| | | ||||||
* | | add uglifier version info in the 'what to update' section | Vijay Dev | 2012-01-19 | 1 | -0/+1 | |
| | | ||||||
* | | fix duplicate ids for the headers [ci skip] | Vijay Dev | 2012-01-19 | 1 | -7/+7 | |
| | | ||||||
* | | document AR::Base#with_lock in release notes [ci skip] | Vijay Dev | 2012-01-19 | 1 | -0/+27 | |
| | | ||||||
* | | update the getting_started guide code [ci skip] | Vijay Dev | 2012-01-19 | 9 | -24/+57 | |
| | | ||||||
* | | Merge pull request #4531 from exviva/pessimistic_with_lock | Aaron Patterson | 2012-01-19 | 1 | -0/+11 | |
| | | | | | | | | Add ActiveRecord::Base#with_lock | |||||
* | | revising release notes [ci skip] | Vijay Dev | 2012-01-19 | 1 | -2/+2 | |
| | | ||||||
* | | update release note: timestamps is non-null as default | Fujimura Daisuke | 2012-01-19 | 1 | -0/+2 | |
| | | ||||||
* | | revise wording [ci skip] | Vijay Dev | 2012-01-19 | 1 | -2/+2 | |
| | | ||||||
* | | Adding Action Mailer section to 3.2 release notes | Guillermo Iguaran | 2012-01-19 | 1 | -0/+6 | |
| | | ||||||
* | | Update Release Notes: sprockets-rails section should be inside of ActionPack ↵ | Guillermo Iguaran | 2012-01-19 | 1 | -1/+1 | |
| | | | | | | | | section | |||||
* | | ActionController::UrlEncodedPairParser is deprecated. Replaced the url ↵ | Makoto Inoue | 2012-01-19 | 1 | -2/+2 | |
| | | | | | | | | | | | | parsing example with Rack::Utils.parse_query - https://webrat.lighthouseapp.com/projects/10503/tickets/161-urlencodedpairparser-removed-in-edge-rails | |||||
* | | updates to 3.2 release notes | Vijay Dev | 2012-01-18 | 1 | -1/+19 | |
| | | ||||||
* | | Update CHANGELOG and docs for config.assets.logger | Guillermo Iguaran | 2012-01-18 | 1 | -2/+1 | |
| | | ||||||
* | | Silent Sprockets logger when config.assets.logger is set to false | Guillermo Iguaran | 2012-01-18 | 1 | -0/+1 | |
| | | ||||||
* | | Add default charset config to ActionDispatch | Carlos Antonio da Silva | 2012-01-17 | 1 | -0/+8 | |
| | | ||||||
* | | Add option to configure Sprockets logger | Rafael Mendonça França | 2012-01-17 | 1 | -0/+2 | |
| | | ||||||
* | | minor edits in getting started guide | Vijay Dev | 2012-01-16 | 1 | -2/+2 | |
| | | ||||||
* | | copy editing asset pipeline changes | Vijay Dev | 2012-01-16 | 1 | -7/+6 | |
| | | ||||||
* | | [docs] Update pipeline asset organization section. | Richard Hulse | 2012-01-16 | 1 | -4/+57 | |
| | | | | | | | | | | * Calified how assets are included. * Added information about using index manifests. |