aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #263 from CvX/masterJosé Valim2011-05-071-1/+1
|\
| * Corrected dbconsole usage message.2011-04-121-1/+1
* | Merge remote branch 'rolftimmermans/desc_tracker'José Valim2011-05-077-34/+64
|\ \
| * \ Merge remote-tracking branch 'upstream/master' into desc_trackerRolf Timmermans2011-03-27137-788/+2315
| |\ \
| * | | Revert "Revert "It should be possible to use ActiveSupport::DescendantTracker...Rolf Timmermans2011-03-131-7/+9
| * | | Refactored AS::DescendantsTracker test cases so they can be tested without AS...Rolf Timmermans2011-03-133-27/+52
| * | | Missing dependency in MultiByte test.Rolf Timmermans2011-03-131-0/+1
| * | | Add missing dependency string inflection test.Rolf Timmermans2011-03-131-0/+1
| * | | Missing dependency for duration test.Rolf Timmermans2011-03-131-0/+1
* | | | Merge pull request #248 from bigfix/enumerable_as_jsonJosé Valim2011-05-072-10/+27
|\ \ \ \
| * | | | Enumerable should pass encoding options to children in #as_json/#to_json.John Firebaugh2011-04-012-10/+27
* | | | | Merge pull request #349 from bradley178/masterJosé Valim2011-05-072-3/+10
|\ \ \ \ \
| * | | | | Fix bug with empty CDATA not being handled in Hash.from_xmlBradley Harris2011-04-292-3/+4
| * | | | | Added test for empty CDATA bug in from_xmlBradley Harris2011-04-291-2/+8
* | | | | | Use .ref instead of .to_sym.José Valim2011-05-072-2/+4
* | | | | | adds comments clarifying the role of SharedGeneratorTestsXavier Noria2011-05-073-0/+7
* | | | | | Merge pull request #424 from gnufied/masterJosé Valim2011-05-062-2/+27
|\ \ \ \ \ \
| * | | | | | fix yield not working from around filter of observers, fixes Github#329Hemant Kumar2011-05-072-2/+27
* | | | | | | Revert the merge because tests did not pass.José Valim2011-05-063-44/+5
* | | | | | | Merge pull request #423 from richardiux/masterJosé Valim2011-05-063-5/+44
|\ \ \ \ \ \ \
| * | | | | | | Adding base method symbolized_sti_name to activerecord base to be used on ide...Richard Millan2011-05-063-9/+15
| * | | | | | | Test: identity on inherited classes should behave the same when turned on or offRichard Millan2011-05-051-0/+16
| * | | | | | | Testing identity map on inherited active record classes. Distinct models tha...Richard Millan2011-05-051-0/+17
* | | | | | | | Merge pull request #419 from smartinez87/avail_actionJosé Valim2011-05-061-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | better styling on #available_action? docsSebastian Martinez2011-05-061-2/+2
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #418 from myronmarston/am_observer_doc_updatesAaron Patterson2011-05-063-3/+53
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Add documentation for new observer enable/disable feature.Myron Marston2011-05-063-3/+53
|/ / / / / / /
* | | | | | | Revert to old semantics, use available_action? instead of action_method?.José Valim2011-05-064-28/+38
* | | | | | | Merge pull request #389 from jasonrudolph/always_flush_logger_at_exitJosé Valim2011-05-063-14/+22
|\ \ \ \ \ \ \
| * | | | | | | Add test to verify production rake tasks flush logger on exitJason Rudolph2011-05-061-0/+13
| * | | | | | | Always flush logger at exitJason Rudolph2011-05-062-14/+9
|/ / / / / / /
* | | | | | | Merge pull request #414 from asanghi/lh5796José Valim2011-05-064-12/+20
|\ \ \ \ \ \ \
| * | | | | | | be consistentAditya Sanghi2011-05-061-3/+1
| * | | | | | | review fixesAditya Sanghi2011-05-063-6/+11
| * | | | | | | default orm and test_framework to false; change application.rb template accor...Aditya Sanghi2011-05-063-12/+12
| * | | | | | | When skipping skip active record, mark config.generators.orm to false; LH 579...Aditya Sanghi2011-05-062-1/+6
* | | | | | | | Don't pluralize, camelize.José Valim2011-05-062-3/+3
* | | | | | | | More updates to ivars list.José Valim2011-05-065-7/+11
* | | | | | | | Move variables to underscore format, update protected instance variables list.José Valim2011-05-066-23/+41
|/ / / / / / /
* | | | | | | Merge pull request #410 from asanghi/LH6074José Valim2011-05-062-3/+18
|\ \ \ \ \ \ \
| * | | | | | | strip spaceAditya Sanghi2011-05-061-2/+2
| * | | | | | | Take leap years into account more seriously when calculating year distance [#...Aditya Sanghi2011-05-062-3/+18
* | | | | | | | Merge pull request #396 from asanghi/lh_4346Xavier Noria2011-05-062-29/+187
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Multiparameter POLA, time_select fixes. See LH4346Aditya Sanghi2011-05-052-29/+187
* | | | | | | | Merge pull request #408 from etdsoft/masterJosé Valim2011-05-061-1/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Take into account the Rack::Server :SSLEnable option when building the applic...Daniel Martin2011-05-061-1/+2
|/ / / / / / / /
* | | | | | | | Ensure params wrapper settings are not inherited and calculated each time.José Valim2011-05-062-4/+28
* | | | | | | | Update CHANGELOGs.José Valim2011-05-063-21/+18
* | | | | | | | Merge pull request #400 from arunagw/ruby_profJosé Valim2011-05-051-5/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Grouped the ruby-prof into test.Arun Agrawal2011-05-051-1/+4