Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | Merge pull request #2146 from dmathieu/blank_binary_encoding | Xavier Noria | 2011-07-20 | 1 | -1/+6 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | 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 on a 3... | Josh Kalderimis | 2011-07-19 | 1 | -1/+1 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #2155 from vijaydev/changelogs | Santiago Pastorino | 2011-07-19 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | 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 | 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 | Norman Clarke | 2011-07-19 | 1 | -0/+2 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #2139 from mcmire/issue_2078_master | Santiago Pastorino | 2011-07-18 | 2 | -1/+13 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | ActiveRecord: Fix eager loading so that giving a blank order clause generates... | Elliot Winkler | 2011-07-18 | 2 | -1/+13 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #2141 from joshk/master | Xavier Noria | 2011-07-18 | 4 | -9/+159 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | This fixes an issue when bundling to a local path (eg. /vendor/bundle). | Josh Kalderimis | 2011-07-17 | 1 | -6/+2 | |
| * | | | | | Added a .travis.yml config and travis specific ci script. | Josh Kalderimis | 2011-07-15 | 3 | -3/+157 | |
| | |_|/ / | |/| | | | ||||||
* | | | | | 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 | Jesse Storimer | 2011-07-18 | 2 | -4/+23 | |
* | | | | | | 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. 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 | John Firebaugh | 2011-07-17 | 6 | -90/+190 | |
| * | | | | | | Move to_xml tests to xml_serialization_test.rb | John Firebaugh | 2011-07-17 | 2 | -143/+133 | |
| * | | | | | | 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 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | 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 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | 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 dynamic... | Prem Sichanugrist | 2011-07-17 | 4 | -0/+47 | |
* | | | | | | | | 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 | Arun Agrawal | 2011-07-18 | 1 | -2/+1 | |
| |/ / / / / / / | ||||||
* / / / / / / / | Don't do remove_possible_method when delegate is used. Two reasons: 1) warnin... | Jon Leighton | 2011-07-18 | 2 | -5/+2 | |
|/ / / / / / / | ||||||
* | | | | | | | 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 refactor `html_safe` test to be... | Prem Sichanugrist | 2011-07-17 | 1 | -2/+6 | |
| | |/ / / / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #2018 from bhus/render_partial_invalid_check | Santiago Pastorino | 2011-07-17 | 3 | -0/+16 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Added view template invalid name check, along with tests. No merges in commit. | huskins | 2011-07-13 | 3 | -0/+16 | |
* | | | | | | | | Revert "Fix failure in test_preserves_existing_fixture_data from test/cases/f... | Jon Leighton | 2011-07-17 | 1 | -2/+2 | |
| |/ / / / / / |/| | | | | | | ||||||
* | | | | | | | Merge pull request #2118 from arunagw/fix_plugin_gen_test | Santiago Pastorino | 2011-07-17 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | ||||||
| * | | | | | | As we are adding db folder in it. Required in test also. | Arun Agrawal | 2011-07-17 | 1 | -1/+1 | |
|/ / / / / / | ||||||
* | | | | | | indeed, if we are going to remove everything in public/assets on assets:clean... | Xavier Noria | 2011-07-17 | 1 | -4/+1 | |
* | | | | | | if we are cleaning all files, we are cleaning all gz files | Xavier Noria | 2011-07-17 | 1 | -1/+0 | |
* | | | | | | Merge pull request #2082 from htanata/rake_routes_formatting | Santiago Pastorino | 2011-07-16 | 4 | -15/+107 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Improve formatting of route to Rack application in rake routes. | Hendy Tanata | 2011-07-17 | 2 | -3/+24 | |
| * | | | | | | Better formatting of route requirements in rake:routes. | Hendy Tanata | 2011-07-16 | 4 | -14/+85 | |
| | |/ / / / | |/| | | | |