| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #2165 from joshk/fixtures_test_fix | Xavier Noria | 2011-07-20 | 1 | -2/+2 |
| |\ | | | | | Timezone fixtures test correction | ||||
| | * | this fixes a brittle test in fixtures_test.rb which fails when you are in a ↵ | Josh Kalderimis | 2011-07-20 | 1 | -2/+2 |
| | | | | | | | | | timezone which is ahead of UTC but UTC is in the previous day still. | ||||
| * | | Merge pull request #2136 from judearasu/guides_branch | Xavier Noria | 2011-07-20 | 2 | -4/+6 |
| |\ \ | |/ |/| | notextile tag in rails guides generator has been placed with ascii quotes | ||||
| | * | notextile tag has been placed with ascii quotes | JudeArasu | 2011-07-19 | 2 | -4/+6 |
| | | | |||||
| * | | documents the changes to String#blank? in the AS guide | Xavier Noria | 2011-07-20 | 1 | -1/+3 |
| | | | |||||
| * | | registers the changes to String#blank? in the CHANGELOG | Xavier Noria | 2011-07-20 | 1 | -0/+3 |
| | | | |||||
| * | | Merge pull request #2164 from dmathieu/missing_require | Xavier Noria | 2011-07-20 | 1 | -0/+1 |
| |\ \ | | | | | | | missing require of string/encoding to have access to encoding_aware? | ||||
| | * | | missing require of string/encoding to have access to encoding_aware? | Damien Mathieu | 2011-07-20 | 1 | -0/+1 |
| |/ / | |||||
| * | | Merge pull request #2146 from dmathieu/blank_binary_encoding | Xavier Noria | 2011-07-20 | 1 | -1/+6 |
| |\ \ | | | | | | | fix String#blank? on binary strings | ||||
| | * | | fix String#blank? on binary strings. | Damien Mathieu | 2011-07-20 | 1 | -1/+6 |
| | | | | |||||
| * | | | Merge pull request #2160 from joshk/patch-5 | Jeremy Kemper | 2011-07-19 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | Changed the year of a date used in a test which fails when using 1.8.7 | ||||
| | * | | | Changed the year of a date used in a test which fails when using 1.8.7 on a ↵ | Josh Kalderimis | 2011-07-19 | 1 | -1/+1 |
| |/ / / | | | | | | | | | | 32bit machine (ArgumentError: time out of range) | ||||
| * | | | Merge pull request #2155 from vijaydev/changelogs | Santiago Pastorino | 2011-07-19 | 1 | -0/+2 |
| |\ \ \ | | | | | | | | | Adding changelog entry for submit helper change which removed object_name_id generation | ||||
| | * | | | add entry for submit helper change removing object_name_id | Vijay Dev | 2011-07-20 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | Merge pull request #2154 from vijaydev/better_map | Santiago Pastorino | 2011-07-19 | 1 | -1/+1 |
| |\ \ \ \ | |/ / / |/| | | | Avoid Symbol#to_proc | ||||
| | * | | | avoid Symbol#to_proc | Vijay Dev | 2011-07-20 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | Merge pull request #2148 from norman/master | Santiago Pastorino | 2011-07-19 | 1 | -0/+2 |
| |\ \ \ | |/ / |/| | | Explicitly require Active Support dependencies (master) | ||||
| | * | | Explicitly require Active Support dependencies | Norman Clarke | 2011-07-19 | 1 | -0/+2 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | | This fixes errors when using Active Record outside of Rails. In Rails, these files are required by other classes that are always loaded, so this error does not happen. Without core_ext/module/delegation, a NoMethodError is raised because `delegate` remains undefined. Without core_ext/class/attribute_acessors, an ArgumentError is raised because `delegate` does not receive a value for its :to option. | ||||
| * | | Merge pull request #2139 from mcmire/issue_2078_master | Santiago Pastorino | 2011-07-18 | 2 | -1/+13 |
| |\ \ | | | | | | | Fix for #2078 (against master) | ||||
| | * | | ActiveRecord: Fix eager loading so that giving a blank order clause ↵ | Elliot Winkler | 2011-07-18 | 2 | -1/+13 |
| | |/ | | | | | | | generates valid SQL | ||||
| * | | Merge pull request #2141 from joshk/master | Xavier Noria | 2011-07-18 | 4 | -9/+159 |
| |\ \ | |/ |/| | Config files to get Rails on Travis-CI | ||||
| | * | This fixes an issue when bundling to a local path (eg. /vendor/bundle). | Josh Kalderimis | 2011-07-17 | 1 | -6/+2 |
| | | | | | | | | | | | If you bundle to a local path bundler is not included in it, so calling "gem 'bundler'" will fail. | ||||
| | * | Added a .travis.yml config and travis specific ci script. | Josh Kalderimis | 2011-07-15 | 3 | -3/+157 |
| | | | | | | | | | | | | | | | | | Don't install ruby-debug if running the test suite on Travis, linecache19 is the main offender, very very slow. And do not install pg if Travis is bundling the gems, pg will be setup on Travis soon. | ||||
| * | | Merge pull request #2133 from jstorimer/ensure-status-codes-are-logged-properly | José Valim | 2011-07-18 | 2 | -4/+23 |
| |\ \ | | | | | | | Ensure that status codes are logged properly | ||||
| | * | | Ensure that status codes are logged properly | Jesse Storimer | 2011-07-18 | 2 | -4/+23 |
| | | | | | | | | | | | | | | | | | | | Needed to move AC::Metal::Instrumentation before AM::Metal::Rescue so that status codes rendered from rescue_from blocks are logged properly. | ||||
| * | | | Merge pull request #2116 from guilleiguaran/fix-environment-generator-action | Santiago Pastorino | 2011-07-18 | 2 | -2/+10 |
| |\ \ \ | |/ / |/| | | Fix Rails::Generators::Actions#environment when env is passed | ||||
| | * | | Fix Rails::Generators::Actions#environment when env is passed. Closes #2110 | Guillermo Iguaran | 2011-07-18 | 2 | -2/+10 |
| | | | | |||||
| * | | | Merge pull request #195 from bigfix/active_model_include_serialization | José Valim | 2011-07-18 | 8 | -241/+343 |
| |\ \ \ | | | | | | | | | ActiveModel support for the :include serialization option | ||||
| | * | | | ActiveModel support for the :include serialization option | John Firebaugh | 2011-07-17 | 6 | -90/+190 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit moves support for the :include serialization option for serializing associated objects out of ActiveRecord in into ActiveModel. The following methods support the :include option: * serializable_hash * to_json * to_xml Instances must respond to methods named by the values of the :includes array (or keys of the :includes hash). If an association method returns an object that is_a?(Enumerable) (which AR has_many associations do), it is assumed to be a collection association, and its elements must respond to :serializable_hash. Otherwise it must respond to :serializable_hash itself. While here, fix #858, XmlSerializer should not singularize already singular association names. | ||||
| | * | | | Move to_xml tests to xml_serialization_test.rb | John Firebaugh | 2011-07-17 | 2 | -143/+133 |
| | | | | | | | | | | | | | | | | | | | | | One duplicate was eliminated: test_to_xml_including_methods/ test_methods_are_called_on_object. | ||||
| | * | | | We already have the record; no need to retrieve it again | John Firebaugh | 2011-07-17 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Replace map+compact with select | John Firebaugh | 2011-07-17 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Add a test | John Firebaugh | 2011-07-17 | 1 | -0/+5 |
| | | | | | |||||
| | * | | | serializable_hash(:only => [], :methods => [:foo]) should work | John Firebaugh | 2011-07-17 | 2 | -7/+14 |
| | | | | | |||||
| * | | | | Merge pull request #2075 from lawrencepit/match_attribute_method | José Valim | 2011-07-18 | 1 | -6/+27 |
| |\ \ \ \ | | | | | | | | | | | Optimization of ActiveModel's match_attribute_method? | ||||
| | * | | | | Made attribute_method_matchers_cache private + doc | Lawrence Pit | 2011-07-17 | 1 | -3/+13 |
| | | | | | | |||||
| | * | | | | Issue #2075 Optimization of ActiveModel's match_attribute_method? | Lawrence Pit | 2011-07-16 | 1 | -9/+17 |
| | | | | | | |||||
| | * | | | | Optimization of ActiveModel's match_attribute_method? | Lawrence Pit | 2011-07-15 | 1 | -2/+5 |
| | | |_|/ | |/| | | |||||
| * | | | | Merge pull request #2128 from sikachu/master-dynamic_finder | Jon Leighton | 2011-07-18 | 4 | -16/+49 |
| |\ \ \ \ | | | | | | | | | | | Raise an ArgumentError if user passing less number of argument in the dynamic finder | ||||
| | * | | | | Refactor test case to use anonymous class - Thank you @tenderlove | Prem Sichanugrist | 2011-07-18 | 1 | -13/+8 |
| | | | | | | |||||
| | * | | | | Refactor the code a bit to reduce the duplication | Prem Sichanugrist | 2011-07-17 | 1 | -17/+8 |
| | | | | | | |||||
| | * | | | | Raise an ArgumentError if user passing less number of argument in the ↵ | Prem Sichanugrist | 2011-07-17 | 4 | -0/+47 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dynamic finder The previous behavior was unintentional, and some people was relying on it. Now the dynamic finder will always expecting the number of arguments to be equal or greater (so you can still pass the options to it.) So if you were doing this and expecting the second argument to be nil: User.find_by_username_and_group("sikachu") You'll now get `ArgumentError: wrong number of arguments (1 for 2).` You'll then have to do this: User.find_by_username_and_group("sikachu", nil) | ||||
| * | | | | | make tzinfo a development dependency | Aaron Patterson | 2011-07-18 | 1 | -1/+2 |
| | | | | | | |||||
| * | | | | | Merge pull request #2124 from arunagw/render_partial_invalid_check_fix | Santiago Pastorino | 2011-07-17 | 1 | -2/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | Checking with to_s. As regexp fail with 1.8.7 | ||||
| | * | | | | | Checking with to_s. As regexp fail with 1.8.7 | Arun Agrawal | 2011-07-18 | 1 | -2/+1 |
| | |/ / / / | |||||
| * / / / / | Don't do remove_possible_method when delegate is used. Two reasons: 1) ↵ | Jon Leighton | 2011-07-18 | 2 | -5/+2 |
| |/ / / / | | | | | | | | | | | | | warnings should be shown, and fixed at the source and 2) the code is slow. Fixes #1937. | ||||
| * | | | | Merge pull request #2046 from sikachu/master-test_fix | Santiago Pastorino | 2011-07-17 | 1 | -2/+6 |
| |\ \ \ \ | | | | | | | | | | | Fix a wrong assertion on url_helper_test, and add missing `#html_safe?` a | ||||
| | * | | | | Fix a wrong assertion on url_helper_test, and refactor `html_safe` test to ↵ | Prem Sichanugrist | 2011-07-17 | 1 | -2/+6 |
| | | |/ / | |/| | | | | | | | | | | be in its method | ||||
| * | | | | Merge pull request #2018 from bhus/render_partial_invalid_check | Santiago Pastorino | 2011-07-17 | 3 | -0/+16 |
| |\ \ \ \ | | | | | | | | | | | Render partial invalid check | ||||
| | * | | | | Added view template invalid name check, along with tests. No merges in commit. | huskins | 2011-07-13 | 3 | -0/+16 |
| | | | | | | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |