Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | copy-edit contributing guide [ci skip] | Vijay Dev | 2012-03-13 | 1 | -2/+2 | |
| | | | | ||||||
| * | | | Merge remote-tracking branch 'origin/master' | Mark Thomson | 2012-03-13 | 9 | -49/+86 | |
| |\ \ \ | ||||||
| | * | | | [config guide] Add mass_assignment_sanitizer to Active Record config options | Ryan Bigg | 2012-03-12 | 1 | -0/+2 | |
| | | | | | ||||||
| | * | | | Advise to keep secret token private | Filipe Moreira | 2012-03-12 | 1 | -0/+2 | |
| | | | | | ||||||
| | * | | | Advise to keep secret token private | Filipe Moreira | 2012-03-12 | 1 | -0/+2 | |
| | | | | | ||||||
| | * | | | Merge remote-tracking branch 'original_repo/master' | Avi Tzurel | 2012-03-12 | 11 | -117/+208 | |
| | |\ \ \ | ||||||
| | | * | | | Add engines guide to documents.yaml | Ryan Bigg | 2012-03-11 | 1 | -0/+4 | |
| | | | | | | ||||||
| | | * | | | [instrumentation] Add further action placeholders | Ryan Bigg | 2012-03-11 | 1 | -0/+12 | |
| | | | | | | ||||||
| | | * | | | [instrumentation guide] Cover deliver.action_mailer event | Ryan Bigg | 2012-03-11 | 1 | -0/+18 | |
| | | | | | | ||||||
| | | * | | | [instrumentation guide] Cover receive.action_mailer event | Ryan Bigg | 2012-03-11 | 1 | -0/+27 | |
| | | | | | | ||||||
| | | * | | | Fixed Issue #2884 ActiveModel::SecurePassword code / rdoc conflict; an ↵ | Michael de Silva | 2012-03-11 | 2 | -0/+17 | |
| | | | | | | | | | | | | | | | | | | | | | | | | elucidated explanation has been provided and ActiveModel en-locale updated to present a less confusing attribute name for 'password_digest' in form errors due to "has_secure_password" | |||||
| | | * | | | attr_accessor_with_default was deprecated and removed. | Andrew France | 2012-03-11 | 1 | -49/+0 | |
| | | | | | | | | | | | | | | | | | | Deprecated in 673372152032a886ba9196c69348386834590eab and removed in 9cafc28874a681082f9f7e1e445db91f195a25ae. | |||||
| | * | | | | Squash commits into a single commit | Avi Tzurel | 2012-03-11 | 1 | -0/+2 | |
| | | | | | | ||||||
| * | | | | | Added documentation for the ActionController::MimeResponds::Collector class. | Mark Thomson | 2012-03-13 | 1 | -1/+24 | |
| | |/ / / | |/| | | | ||||||
| * | | | | Revised explanation of fields_for usage. | Mark Thomson | 2012-03-11 | 1 | -10/+39 | |
| | | | | | | | | | | | | | | | | | | | | Minor tweak to previous comments on form_for and form_helper.rb preamble | |||||
| * | | | | added clarification stating the counter_cache attribute needs to be created ↵ | Michael de Silva | 2012-03-11 | 1 | -1/+3 | |
| | | | | | | | | | | | | | | | | | | | | on the associate class via a migration | |||||
| * | | | | Added clarification to description of how initial form values are derived. | Mark Thomson | 2012-03-10 | 1 | -1/+2 | |
| | | | | | ||||||
| * | | | | Merge branch '3.9.12' | Mark Thomson | 2012-03-10 | 1 | -53/+84 | |
| |\ \ \ \ | ||||||
| | * | | | | Revised explanation of form_for usage | Mark Thomson | 2012-03-10 | 1 | -53/+84 | |
| | | | | | | ||||||
| * | | | | | Merge branch 'master' of github.com:lifo/docrails | Grant McLean | 2012-03-10 | 1 | -2/+1 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Fix layout method doc formatting | Alexey Vakhov | 2012-03-10 | 1 | -2/+1 | |
| | | | | | | | ||||||
| * | | | | | | fix fragment portion of some links | Grant McLean | 2012-03-10 | 2 | -3/+3 | |
| |/ / / / / | ||||||
| * | / / / | Fix 'Security#Mass Assignment' URL typo | Abe Voelker | 2012-03-09 | 1 | -1/+1 | |
| | |/ / / | |/| | | | ||||||
| * | | | | Fix comment about layout folders lookup | Alexey Vakhov | 2012-03-09 | 1 | -2/+2 | |
| | | | | | ||||||
| * | | | | Document validations and callbacks Array support for :if and :unless options | João Britto | 2012-03-09 | 1 | -2/+16 | |
| | | | | | ||||||
| * | | | | Close string quotes | João Britto | 2012-03-09 | 1 | -1/+1 | |
| |/ / / | ||||||
| * | | | Additional preamble comments in form_helper.rb. | Mark Thomson | 2012-03-08 | 1 | -7/+18 | |
| | | | | ||||||
| * | | | Small correction to the description of the role of the form builder. | Mark Thomson | 2012-03-08 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | (endpoints are generated by form_for without reference to the form builder) | |||||
* | | | | Merge pull request #5414 from nashby/select-hidden-input | Piotr Sarnacki | 2012-03-13 | 4 | -1/+14 | |
|\ \ \ \ | | | | | | | | | | | add 'include_hidden' option to select tag, closes #5402 | |||||
| * | | | | add 'include_hidden' option to select tag, closes #5402 | Vasiliy Ermolovich | 2012-03-13 | 4 | -1/+14 | |
| | |/ / | |/| | | ||||||
* | | | | Merge pull request #5416 from kennyj/fix_5399 | Aaron Patterson | 2012-03-13 | 2 | -2/+8 | |
|\ \ \ \ | |/ / / |/| | | | Fix GH #5399. connection_pools's keys are ActiveRecord::Base::ConnectionSpecification objects. | |||||
| * | | | Fix GH #5399. connection_pools's keys are ↵ | kennyj | 2012-03-14 | 2 | -2/+8 | |
|/ / / | | | | | | | | | | ActiveRecord::Base::ConnectionSpecification objects. | |||||
* | | | Merge pull request #5397 from rafaelfranca/fix-scaffold | José Valim | 2012-03-13 | 4 | -4/+52 | |
|\ \ \ | | | | | | | | | Do not use the attributes hash in the scaffold functional tests | |||||
| * | | | Use the attributes hash explicitly | Rafael Mendonça França | 2012-03-13 | 4 | -12/+44 | |
| | | | | ||||||
| * | | | Do not use the attributes hash in the scaffold functional tests | Rafael Mendonça França | 2012-03-12 | 4 | -4/+20 | |
| | | | | ||||||
* | | | | Actually commit the change! | David Heinemeier Hansson | 2012-03-13 | 1 | -1/+0 | |
| | | | | ||||||
* | | | | Undo unwarranted change to coding conventions. I am not a fan of the ↵ | David Heinemeier Hansson | 2012-03-13 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | aesthetics of private/public at the root but more importantly, we should not be changing coding conventions with almost a decades worth of history at a whim. The conventions are there to have a consistent coding style, that is their primary purpose. When there is so much existing code with the existing style, any change will have to lift an enormous burden of proof as to why its overwhelmingly superior. That is not the case here, so this is being reverted. | |||||
* | | | | Merge pull request #5406 from parndt/fix_issue_5193_in_master | José Valim | 2012-03-13 | 1 | -0/+5 | |
|\ \ \ \ | | | | | | | | | | | Fix issue #5193 in master | |||||
| * | | | | Fixed problem when fixture_path is not always defined (incidentally, only ↵ | Philip Arndt | 2012-03-13 | 1 | -1/+3 | |
| | | | | | | | | | | | | | | | | | | | | when ActiveRecord is according to test_help.rb). | |||||
| * | | | | Fixes issue #5193 using the instructions provided in the issue. | Philip Arndt | 2012-03-13 | 1 | -0/+3 | |
| | | | | | ||||||
* | | | | | Merge pull request #5407 from homakov/patch-1 | Santiago Pastorino | 2012-03-13 | 1 | -2/+2 | |
|\ \ \ \ \ | |/ / / / |/| | | | | 'module' is reserved word. Sample of code with error - not cool. | |||||
| * | | | | 'module' is reserved word. Sample of code with error - not cool. | Egor Homakov | 2012-03-13 | 1 | -2/+2 | |
|/ / / / | ||||||
* | | | | Merge pull request #5404 from MarkMT/master | José Valim | 2012-03-13 | 1 | -2/+6 | |
|\ \ \ \ | | | | | | | | | | | Updated description of #retrieve_collector_from_mimes | |||||
| * | | | | Updated description of #retrieve_collector_from_mimes | Mark Thomson | 2012-03-13 | 1 | -2/+6 | |
|/ / / / | ||||||
* | | | | use AS::Logger so we are consistent | Aaron Patterson | 2012-03-12 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | allow people to specify custom formatters, use the default formatter in ↵ | Aaron Patterson | 2012-03-12 | 4 | -4/+10 | |
|/ / / | | | | | | | | | | production so that PID and timestamp are logged. fixes #5388 | |||||
* | | | Remove unused method | Santiago Pastorino | 2012-03-12 | 1 | -4/+0 | |
| | | | ||||||
* | | | Merge pull request #5294 from robinroestenburg/master | Aaron Patterson | 2012-03-12 | 3 | -26/+53 | |
|\ \ \ | | | | | | | | | Refactoring of `arel_attributes_values` method | |||||
| * | | | Removed flag attributes. | Robin Roestenburg | 2012-03-06 | 3 | -22/+35 | |
| | | | | ||||||
| * | | | Refactored method arel_attributes_values. | Robin Roestenburg | 2012-03-06 | 1 | -20/+34 | |
| | | | |