Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Merge pull request #4735 from arton/master | Aaron Patterson | 2012-01-31 | 1 | -1/+5 | |
|\ \ \ \ \ | ||||||
| * | | | | | run direcly $0 if rake invoked by Windows batch file. | arton | 2012-01-29 | 1 | -1/+5 | |
* | | | | | | Merge pull request #4742 from petervandenabeele/master | Aaron Patterson | 2012-01-31 | 1 | -0/+3 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Set default_timezone explicitly for a test in activerecord/../base_test.rb | Peter Vandenabeele | 2012-01-29 | 1 | -0/+3 | |
* | | | | | | | Merge pull request #4746 from jenslukowski/issue4718 | Aaron Patterson | 2012-01-31 | 2 | -1/+16 | |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | ||||||
| * | | | | | | fix for Issue 4718 | Jens Lukowski | 2012-01-29 | 1 | -1/+8 | |
| * | | | | | | failing test case for Issue 4718 | Jens Lukowski | 2012-01-28 | 1 | -0/+8 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | Merge pull request #4803 from lucascaton/master | Aaron Patterson | 2012-01-31 | 3 | -3/+5 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Remove slash from favicon_link_tag method attribute | Lucas Caton | 2012-01-31 | 3 | -3/+5 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #4802 from carlosantoniodasilva/collection-helpers-refactor | José Valim | 2012-01-31 | 3 | -14/+28 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Remove eval calls, use send.. eval is evil | Carlos Antonio da Silva | 2012-01-31 | 1 | -3/+3 | |
| * | | | | | | Refactor select tag form helpers | Carlos Antonio da Silva | 2012-01-31 | 2 | -11/+25 | |
| | |_|/ / / | |/| | | | | ||||||
* | | | | | | Merge pull request #4791 from gregolsen/reflection_test_fixed | José Valim | 2012-01-31 | 3 | -4/+4 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | test_get_ids_for_ordered_association fixed | gregolsen | 2012-01-31 | 2 | -2/+2 | |
| * | | | | | | reflection test fixed | gregolsen | 2012-01-31 | 1 | -2/+2 | |
* | | | | | | | Merge pull request #4800 from rafaelfranca/remove-warnings | José Valim | 2012-01-31 | 4 | -16/+31 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Remove deprecation warnings from tests | Rafael Mendonça França | 2012-01-31 | 3 | -13/+28 | |
| * | | | | | | | Put spaces between the words at deprecation warning | Rafael Mendonça França | 2012-01-31 | 1 | -3/+3 | |
| | |/ / / / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #4797 from kennyj/fix_4774 | José Valim | 2012-01-31 | 2 | -1/+6 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Don't run bundle install when passed with --pretend option | kennyj | 2012-02-01 | 2 | -1/+6 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #4798 from ihower/fix_routing_typo | José Valim | 2012-01-31 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Fix typo in routing documentation | Wen-Tien Chang | 2012-02-01 | 1 | -1/+1 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #4792 from rafaelfranca/build-fix | José Valim | 2012-01-31 | 2 | -1/+2 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Only add ActiveRecord configuration if it is present | Rafael Mendonça França | 2012-01-31 | 2 | -1/+2 | |
| |/ / / / / | ||||||
* | | | | | | to_proper_path -> to_partial_path | José Valim | 2012-01-31 | 1 | -1/+1 | |
* | | | | | | Update actionpack/lib/action_view/renderer/partial_renderer.rb | José Valim | 2012-01-31 | 1 | -2/+1 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #4783 from gregolsen/ids_reader_fix | Jon Leighton | 2012-01-31 | 3 | -1/+6 | |
|\ \ \ \ \ | ||||||
| * | | | | | ids_reader method fixed, test added to has_many association | gregolsen | 2012-01-31 | 3 | -1/+6 | |
* | | | | | | Merge pull request #4727 from railsaholic/dependent_restrict_should_add_error | Jon Leighton | 2012-01-31 | 11 | -35/+157 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | suggested fixes for :dependent => :restrict deprecation. | Manoj | 2012-01-31 | 5 | -36/+16 | |
| * | | | | | | Same method for has_many and has_one associations | Paco Guzman | 2012-01-31 | 3 | -30/+17 | |
| * | | | | | | Easy dependent_restrict error message | Paco Guzman | 2012-01-31 | 2 | -4/+2 | |
| * | | | | | | has_many/has_one, :dependent => :restrict, deprecation added. | Manoj | 2012-01-29 | 11 | -21/+178 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | Merge pull request #4788 from arunagw/warning_remove_shadowing_var | Santiago Pastorino | 2012-01-31 | 1 | -2/+2 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | warning removed: shadowing outer local variable - klass | Arun Agrawal | 2012-01-31 | 1 | -2/+2 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #4782 from lest/patch-1 | José Valim | 2012-01-31 | 1 | -1/+1 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | fix assets test | Sergey Nartimov | 2012-01-31 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #4763 from kennyj/fix_4754 | Jon Leighton | 2012-01-31 | 2 | -1/+17 | |
|\ \ \ \ \ | ||||||
| * | | | | | Fix GH #4754. Remove double-quote when using ANSI_QUOTES | kennyj | 2012-01-31 | 2 | -1/+17 | |
* | | | | | | Merge pull request #4732 from pwim/refactor-dynamic-match | Jon Leighton | 2012-01-30 | 3 | -28/+60 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Use conditional instead of try | Paul McMahon | 2012-01-31 | 1 | -1/+1 | |
| * | | | | | | Decouple finding matching class from instantiation | Paul McMahon | 2012-01-29 | 1 | -22/+29 | |
| * | | | | | | Move argument validation into match | Paul McMahon | 2012-01-28 | 3 | -1/+13 | |
| * | | | | | | Extract different DynamicFinderMatch subclasses | Paul McMahon | 2012-01-28 | 1 | -26/+39 | |
* | | | | | | | Merge pull request #4769 from sikachu/failing-test | Xavier Noria | 2012-01-30 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fix failing test from [7619bcf2] | Prem Sichanugrist | 2012-01-30 | 1 | -1/+1 | |
* | | | | | | | | query cache instrumentation should included the bindings in the payload [clos... | Xavier Noria | 2012-01-30 | 1 | -1/+1 | |
|/ / / / / / / | ||||||
* | | | | | | | rewrites a couple of alternations in regexps as character classes | Xavier Noria | 2012-01-30 | 2 | -2/+2 | |
* | | | | | | | Merge pull request #4767 from lest/patch-2 | José Valim | 2012-01-30 | 2 | -56/+26 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | merge MRI performance methods into one file | Sergey Nartimov | 2012-01-30 | 2 | -56/+26 | |
|/ / / / / / / |