| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | | Fixes ticket #6379. Improved the handling of Accept headers containing */*. | mathieuravaux | 2011-05-07 | 2 | -4/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `lookup_context#formats=` being too restrictive, "Accept: text/javascript, */*" resulted in [:js, "*/*"] formats instead of [:js, :html]. Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | | | | | xml_mini_test.rb now runs. | José Valim | 2011-05-07 | 2 | -8/+1 | |
| | | | | | | ||||||
| * | | | | | Merge pull request #438 from jasonmichaelroth/ordinalize_negative_numbers | Aaron Patterson | 2011-05-07 | 2 | -2/+32 | |
| |\| | | | | | | | | | | | | | | ordinalize negative numbers patch | |||||
| | * | | | | ordinalize negative numbers patch | Jason | 2011-05-07 | 2 | -2/+32 | |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Applied patch by Amir Manji https://github.com/rails/rails/issues/437#issuecomment-1116045 Signed-off-by: Jason <jasonmichaelroth@gmail.com> | |||||
| * | | | | Merge pull request #435 from vijaydev/master | Xavier Noria | 2011-05-07 | 1 | -5/+10 | |
| |\ \ \ \ | | | | | | | | | | | Update README template to include info about app/assets | |||||
| | * | | | | update readme to reflect app/assets | Vijay Dev | 2011-05-07 | 1 | -5/+10 | |
| |/ / / / | ||||||
| * | | | | Merge pull request #434 from arunagw/changelog_doc | José Valim | 2011-05-07 | 1 | -0/+12 | |
| |\ \ \ \ | | | | | | | | | | | Updated changelog for jdbc* adapters template. | |||||
| | * | | | | Updated change log for jdbc* adapters template. | Arun Agrawal | 2011-05-07 | 1 | -0/+12 | |
| | | | | | | ||||||
| * | | | | | Class.new.name returns an empty string on 1.8 | José Valim | 2011-05-07 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | Revert "Revert the merge because tests did not pass." | José Valim | 2011-05-07 | 3 | -5/+44 | |
| |/ / / / | | | | | | | | | | | | | This reverts commit 886818d2bab40585c0cea763002ffc16917dd0b3. | |||||
| * | | | | Update CHANGELOG. | José Valim | 2011-05-07 | 1 | -0/+2 | |
| | | | | | ||||||
| * | | | | Merge pull request #343 from asanghi/ampm | José Valim | 2011-05-07 | 2 | -4/+85 | |
| |\ \ \ \ | | | | | | | | | | | Allow AM/PM format in datetime selectors | |||||
| | * | | | | DRY this baby up | Aditya Sanghi | 2011-04-29 | 1 | -23/+4 | |
| | | | | | | ||||||
| | * | | | | add more documentation; remove unused assignment | Aditya Sanghi | 2011-04-29 | 1 | -4/+14 | |
| | | | | | | ||||||
| | * | | | | Allow AM/PM in datetime selectors | Aditya Sanghi | 2011-04-29 | 2 | -0/+90 | |
| | | | | | | ||||||
| * | | | | | Merge pull request #286 from jasoncodes/marshal_subsec | José Valim | 2011-05-07 | 2 | -0/+8 | |
| |\ \ \ \ \ | | | | | | | | | | | | | Fix marshal round-tripping of fractional seconds (Time#subsec). | |||||
| | * | | | | | Fix marshal round-tripping of fractional seconds (Time#subsec). | Jason Weathered | 2011-04-17 | 2 | -0/+8 | |
| | | | | | | | ||||||
| * | | | | | | ADdd missing requires (thanks to @arunagw) | José Valim | 2011-05-07 | 2 | -1/+2 | |
| | | | | | | | ||||||
| * | | | | | | Merge pull request #280 from jballanc/frozen-string-strip-tags | José Valim | 2011-05-07 | 2 | -1/+2 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Stripping tags from a frozen string | |||||
| | * | | | | | | Fix for stripping tags from frozen strings. | Joshua Ballanco | 2011-04-14 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This returns behavior under Ruby 1.9 to match Ruby 1.8. | |||||
| | * | | | | | | Test for stripping tags from a frozen string. | Joshua Ballanco | 2011-04-14 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test will pass under Ruby 1.8 but fail under Ruby 1.9 because of the change in behavior of gsub! w.r.t. frozen strings that do not match the pattern used [ruby-core:23664]. | |||||
| * | | | | | | | Merge pull request #275 from pk-amooma/master | José Valim | 2011-05-07 | 2 | -2/+14 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | properly escape "'" to "'" for XML | |||||
| | * | | | | | | | test "Escapes special HTML/XML characters" do ... | Philipp Kempgen | 2011-04-26 | 1 | -0/+12 | |
| | | | | | | | | | ||||||
| | * | | | | | | | for escaping HTML can be treated as normal XML | Philipp Kempgen (Amooma) | 2011-04-14 | 1 | -2/+2 | |
| | | | | | | | | | ||||||
| | * | | | | | | | properly escape "'" to "'" for XML/HTML (BTW Erubis does that as well) | Philipp Kempgen (Amooma) | 2011-04-14 | 1 | -2/+2 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Merge pull request #263 from CvX/master | José Valim | 2011-05-07 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Corrected dbconsole usage message | |||||
| | * | | | | | | | | Corrected dbconsole usage message. | 2011-04-12 | 1 | -1/+1 | ||
| | | | | | | | | | | ||||||
| * | | | | | | | | | Merge remote branch 'rolftimmermans/desc_tracker' | José Valim | 2011-05-07 | 7 | -34/+64 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into desc_tracker | Rolf Timmermans | 2011-03-27 | 137 | -788/+2315 | |
| | |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | Revert "Revert "It should be possible to use ↵ | Rolf Timmermans | 2011-03-13 | 1 | -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 Timmermans | 2011-03-13 | 3 | -27/+52 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AS::Dependencies. | |||||
| | * | | | | | | | | | | Missing dependency in MultiByte test. | Rolf Timmermans | 2011-03-13 | 1 | -0/+1 | |
| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | Add missing dependency string inflection test. | Rolf Timmermans | 2011-03-13 | 1 | -0/+1 | |
| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | Missing dependency for duration test. | Rolf Timmermans | 2011-03-13 | 1 | -0/+1 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Merge pull request #248 from bigfix/enumerable_as_json | José Valim | 2011-05-07 | 2 | -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 Firebaugh | 2011-04-01 | 2 | -10/+27 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Merge pull request #349 from bradley178/master | José Valim | 2011-05-07 | 2 | -3/+10 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Hash.from_xml chokes on empty CDATA | |||||
| | * | | | | | | | | | | | | Fix bug with empty CDATA not being handled in Hash.from_xml | Bradley Harris | 2011-04-29 | 2 | -3/+4 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | Added test for empty CDATA bug in from_xml | Bradley Harris | 2011-04-29 | 1 | -2/+8 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Use .ref instead of .to_sym. | José Valim | 2011-05-07 | 2 | -2/+4 | |
| | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | adds comments clarifying the role of SharedGeneratorTests | Xavier Noria | 2011-05-07 | 3 | -0/+7 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Merge pull request #424 from gnufied/master | José Valim | 2011-05-06 | 2 | -2/+27 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes around_filter from observer, github issue#329 | |||||
| | * | | | | | | | | | | | | fix yield not working from around filter of observers, fixes Github#329 | Hemant Kumar | 2011-05-07 | 2 | -2/+27 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Revert the merge because tests did not pass. | José Valim | 2011-05-06 | 3 | -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/master | José Valim | 2011-05-06 | 3 | -5/+44 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | Identity Map caching bug | |||||
| | * | | | | | | | | | | | | Adding base method symbolized_sti_name to activerecord base to be used on ↵ | Richard Millan | 2011-05-06 | 3 | -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 off | Richard Millan | 2011-05-05 | 1 | -0/+16 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | Testing identity map on inherited active record classes. Distinct models ↵ | Richard Millan | 2011-05-05 | 1 | -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_action | José Valim | 2011-05-06 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | better styling on #available_action? docs | |||||
| | * | | | | | | | | | | | | | better styling on #available_action? docs | Sebastian Martinez | 2011-05-06 | 1 | -2/+2 | |
| | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | ||||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |