aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #263 from CvX/masterJosé Valim2011-05-071-1/+1
|\ | | | | Corrected dbconsole usage message
| * 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 ↵Rolf Timmermans2011-03-131-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActiveSupport::DescendantTracker without getting ActiveSupport::Dependencies for free."" This reverts commit 9f5b1e1ed08df9dbedded0a6b7798d919d43b9a6. Tests have been refactored so they pass in isolation.
| * | | Refactored AS::DescendantsTracker test cases so they can be tested without ↵Rolf Timmermans2011-03-133-27/+52
| | | | | | | | | | | | | | | | AS::Dependencies.
| * | | 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
| * | | | 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
|\ \ \ \ \ | | | | | | | | | | | | Hash.from_xml chokes on empty CDATA
| * | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fixes around_filter from observer, github issue#329
| * | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge pull request #423 from richardiux/master" This reverts commit b8f08c4ea7c56e34e3e17c9006f1ae6d9f7504ee, reversing changes made to fd9df1b1dd1196c2233835e25a6a38956e9e3959.
* | | | | | | Merge pull request #423 from richardiux/masterJosé Valim2011-05-063-5/+44
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Identity Map caching bug
| * | | | | | | Adding base method symbolized_sti_name to activerecord base to be used on ↵Richard Millan2011-05-063-9/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | identity map. Identity map now considers the inheritance when creating the caching keys
| * | | | | | | 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 ↵Richard Millan2011-05-051-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | that use the same database table shouldn't be retrieved as the same object when there is not a type attribute.
* | | | | | | | Merge pull request #419 from smartinez87/avail_actionJosé Valim2011-05-061-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | better styling on #available_action? docs
| * | | | | | | | 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.
| * | | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Always flush logger at exit
| * | | | | | | 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
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to this change, running code via script/runner would demonstrate different logging behavior than running the same code via a rake task. In production mode the script/runner approach would always flush the logger, but the rake-based approach would not automatically flush the logger. This discrepancy violates the principle of least surprise, and it could lead to the loss of important production logging data. This change removes special-case code in the "runner" command, and replaces it with a general solution to ensure that the logger gets flushed at exit. This solution works for "runner", "console", "server", rake tasks, and any other process that loads the Rails environment.
* | | | | | | Merge pull request #414 from asanghi/lh5796José Valim2011-05-064-12/+20
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | config.generators.orm = false when skipping active record. LightHouse #5796
| * | | | | | | 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 ↵Aditya Sanghi2011-05-063-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | accordingly
| * | | | | | | When skipping skip active record, mark config.generators.orm to false; LH ↵Aditya Sanghi2011-05-062-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5796 remainder
* | | | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | distance_of_time_in_words calculates wrong no of years
| * | | | | | | strip spaceAditya Sanghi2011-05-061-2/+2
| | | | | | | |
| * | | | | | | Take leap years into account more seriously when calculating year distance ↵Aditya Sanghi2011-05-062-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [#6074 state:resolved]
* | | | | | | | Merge pull request #396 from asanghi/lh_4346Xavier Noria2011-05-062-29/+187
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Multiparameter POLA (principle of least authority) with respect to time_select fixes. See LH4346
| * | | | | | | Multiparameter POLA, time_select fixes. See LH4346Aditya Sanghi2011-05-052-29/+187
| | | | | | | |
* | | | | | | | Merge pull request #408 from etdsoft/masterJosé Valim2011-05-061-1/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Rails::Server outputs 'http://' even when running over SSL
| * | | | | | | | Take into account the Rack::Server :SSLEnable option when building the ↵Daniel Martin2011-05-061-1/+2
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | application's URL
* | | | | | | | 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
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Adding ruby-prof gem for ruby platform only #jruby
| * | | | | | | | Grouped the ruby-prof into test.Arun Agrawal2011-05-051-1/+4
| | | | | | | | |