aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | Check for existence of exactly the called `fixture_path=` methodPiotr Sarnacki2012-03-131-2/+2
* | | | | Environment in engines tests is required on boot_rails, no need to require ex...Piotr Sarnacki2012-03-131-10/+0
* | | | | Don't need to share engine's tests anymore, plugins are gonePiotr Sarnacki2012-03-132-370/+359
* | | | | Ensure that engine can be mounted at root (#4314)Piotr Sarnacki2012-03-131-0/+54
|/ / / /
* | | | Merge pull request #5419 from nashby/patch-1José Valim2012-03-131-1/+1
|\ \ \ \
| * | | | fix typo in AP CHANGELOG [ci skip]Vasiliy Ermolovich2012-03-131-1/+1
|/ / / /
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-03-1317-129/+260
|\ \ \ \
| * | | | Fix AM GuideAlexey Vakhov2012-03-131-1/+1
| * | | | mark engines guide as wip [ci skip]Vijay Dev2012-03-131-0/+1
| * | | | Revert "Fixed Issue #2884 ActiveModel::SecurePassword code / rdoc conflict; a...Vijay Dev2012-03-132-17/+0
| * | | | copy-edit contributing guide [ci skip]Vijay Dev2012-03-131-2/+2
| * | | | Merge remote-tracking branch 'origin/master'Mark Thomson2012-03-139-49/+86
| |\ \ \ \
| | * | | | [config guide] Add mass_assignment_sanitizer to Active Record config optionsRyan Bigg2012-03-121-0/+2
| | * | | | Advise to keep secret token privateFilipe Moreira2012-03-121-0/+2
| | * | | | Advise to keep secret token privateFilipe Moreira2012-03-121-0/+2
| | * | | | Merge remote-tracking branch 'original_repo/master'Avi Tzurel2012-03-1211-117/+208
| | |\ \ \ \
| | | * | | | Add engines guide to documents.yamlRyan Bigg2012-03-111-0/+4
| | | * | | | [instrumentation] Add further action placeholdersRyan Bigg2012-03-111-0/+12
| | | * | | | [instrumentation guide] Cover deliver.action_mailer eventRyan Bigg2012-03-111-0/+18
| | | * | | | [instrumentation guide] Cover receive.action_mailer eventRyan Bigg2012-03-111-0/+27
| | | * | | | Fixed Issue #2884 ActiveModel::SecurePassword code / rdoc conflict; an elucid...Michael de Silva2012-03-112-0/+17
| | | * | | | attr_accessor_with_default was deprecated and removed. Andrew France2012-03-111-49/+0
| | * | | | | Squash commits into a single commitAvi Tzurel2012-03-111-0/+2
| * | | | | | Added documentation for the ActionController::MimeResponds::Collector class.Mark Thomson2012-03-131-1/+24
| | |/ / / / | |/| | | |
| * | | | | Revised explanation of fields_for usage.Mark Thomson2012-03-111-10/+39
| * | | | | added clarification stating the counter_cache attribute needs to be created o...Michael de Silva2012-03-111-1/+3
| * | | | | Added clarification to description of how initial form values are derived.Mark Thomson2012-03-101-1/+2
| * | | | | Merge branch '3.9.12'Mark Thomson2012-03-101-53/+84
| |\ \ \ \ \
| | * | | | | Revised explanation of form_for usageMark Thomson2012-03-101-53/+84
| * | | | | | Merge branch 'master' of github.com:lifo/docrailsGrant McLean2012-03-101-2/+1
| |\ \ \ \ \ \
| | * | | | | | Fix layout method doc formattingAlexey Vakhov2012-03-101-2/+1
| * | | | | | | fix fragment portion of some linksGrant McLean2012-03-102-3/+3
| |/ / / / / /
| * | / / / / Fix 'Security#Mass Assignment' URL typoAbe Voelker2012-03-091-1/+1
| | |/ / / / | |/| | | |
| * | | | | Fix comment about layout folders lookupAlexey Vakhov2012-03-091-2/+2
| * | | | | Document validations and callbacks Array support for :if and :unless optionsJoão Britto2012-03-091-2/+16
| * | | | | Close string quotesJoão Britto2012-03-091-1/+1
| |/ / / /
| * | | | Additional preamble comments in form_helper.rb.Mark Thomson2012-03-081-7/+18
| * | | | Small correction to the description of the role of the form builder.Mark Thomson2012-03-081-1/+1
* | | | | Merge pull request #5414 from nashby/select-hidden-inputPiotr Sarnacki2012-03-134-1/+14
|\ \ \ \ \
| * | | | | add 'include_hidden' option to select tag, closes #5402Vasiliy Ermolovich2012-03-134-1/+14
| | |/ / / | |/| | |
* | | | | Merge pull request #5416 from kennyj/fix_5399Aaron Patterson2012-03-132-2/+8
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix GH #5399. connection_pools's keys are ActiveRecord::Base::ConnectionSpeci...kennyj2012-03-142-2/+8
|/ / / /
* | | | Merge pull request #5397 from rafaelfranca/fix-scaffoldJosé Valim2012-03-134-4/+52
|\ \ \ \
| * | | | Use the attributes hash explicitlyRafael Mendonça França2012-03-134-12/+44
| * | | | Do not use the attributes hash in the scaffold functional testsRafael Mendonça França2012-03-124-4/+20
* | | | | Actually commit the change!David Heinemeier Hansson2012-03-131-1/+0
* | | | | Undo unwarranted change to coding conventions. I am not a fan of the aestheti...David Heinemeier Hansson2012-03-131-0/+1
* | | | | Merge pull request #5406 from parndt/fix_issue_5193_in_masterJosé Valim2012-03-131-0/+5
|\ \ \ \ \
| * | | | | Fixed problem when fixture_path is not always defined (incidentally, only whe...Philip Arndt2012-03-131-1/+3
| * | | | | Fixes issue #5193 using the instructions provided in the issue.Philip Arndt2012-03-131-0/+3