Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Merge pull request #10506 from seanwalbran/fix-10502-skip-object-filter | Aaron Patterson | 2013-05-07 | 3 | -1/+28 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | add changelog entry for fix-10502-skip-object-filter | Sean Walbran | 2013-05-07 | 1 | -0/+5 | |
| * | | | | | | fix issue #10502, do not recompute method name for already-stringified object... | Sean Walbran | 2013-05-07 | 2 | -1/+23 | |
* | | | | | | | Revert "Merge pull request #10455 from patricksrobertson/bigserial_id_not_ide... | Aaron Patterson | 2013-05-07 | 2 | -35/+2 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #10455 from patricksrobertson/bigserial_id_not_identifying_pk | Aaron Patterson | 2013-05-07 | 2 | -2/+35 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Handle other pk types in PostgreSQL gracefully. | Patrick Robertson | 2013-05-07 | 2 | -2/+35 | |
* | | | | | | Test that #fresh_when accepts an array | Brandon Keepers | 2013-05-07 | 1 | -2/+19 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #10234 from dasch/dasch/fetch-multi | Rafael Mendonça França | 2013-05-06 | 3 | -1/+61 | |
|\ \ \ \ \ | ||||||
| * | | | | | Allow fetching multiple values from the cache at once | Daniel Schierbeck | 2013-05-06 | 3 | -1/+61 | |
* | | | | | | Merge pull request #10377 from bricker/template_digest_ending_with_number | Rafael Mendonça França | 2013-05-06 | 4 | -3/+12 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Allow numbers in partial name for digesting | Bryan Ricker | 2013-05-06 | 4 | -3/+12 | |
* | | | | | | | Merge pull request #10446 from dasch/instrument-template-compilation | Rafael Mendonça França | 2013-05-06 | 1 | -2/+9 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Instrument template compilation | Daniel Schierbeck | 2013-05-06 | 1 | -2/+9 | |
| |/ / / / / | ||||||
* | | | | | | Improve CHANGELOG entry [ci skip] | Rafael Mendonça França | 2013-05-06 | 1 | -4/+4 | |
* | | | | | | Merge pull request #10489 from greenriver/ar_counter_cache_multiple_destroy | Rafael Mendonça França | 2013-05-06 | 3 | -2/+28 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Confirm a record has not already been destroyed before decrementing | Ben Tucker | 2013-05-06 | 3 | -1/+27 | |
* | | | | | | | Merge pull request #10478 from cainlevy/patch-1 | Rafael Mendonça França | 2013-05-06 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | use canonical #controller_path logic in controller test cases | Lance Ivy | 2013-05-05 | 1 | -1/+1 | |
* | | | | | | | | Fix test asserting the sanitized SQL hash differently to some adapters | Rafael Mendonça França | 2013-05-06 | 1 | -1/+7 | |
* | | | | | | | | Merge pull request #10352 from zohlgren/fix_activerecord_sanitization_sanitiz... | Rafael Mendonça França | 2013-05-06 | 3 | -4/+15 | |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | ||||||
| * | | | | | | | Fix bug in ActiveRecord::Sanitization#sanitize_sql_hash_for_conditions | Zach Ohlgren | 2013-05-06 | 3 | -4/+15 | |
* | | | | | | | | Merge pull request #10488 from neerajdotname/10419-b | Rafael Mendonça França | 2013-05-06 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | fix failing test caused by 3771e4d511 | Neeraj Singh | 2013-05-06 | 1 | -2/+2 | |
* | | | | | | | | let rake tasks be robust to a missing RDoc in Rubinius [Fixes #10462] | Xavier Noria | 2013-05-06 | 1 | -45/+56 | |
* | | | | | | | | Merge pull request #10437 from neerajdotname/10419 | Rafael Mendonça França | 2013-05-06 | 3 | -1/+49 | |
|\| | | | | | | | ||||||
| * | | | | | | | raise IrreversibleMigration if no column given | Neeraj Singh | 2013-05-06 | 3 | -1/+49 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #10486 from vipulnsward/remove_variable | Rafael Mendonça França | 2013-05-06 | 1 | -1/+0 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | remove unused variable | Vipul A M | 2013-05-06 | 1 | -1/+0 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #10453 from vipulnsward/destructive_sort | Jeremy Kemper | 2013-05-05 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | use destructive sort on array in Hash#to_param for performance gains. | Vipul A M | 2013-05-05 | 1 | -1/+1 | |
* | | | | | | | | Merge pull request #10480 from juno/fix-typo | Steve Klabnik | 2013-05-05 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fix typo in documentation comment | Junya Ogura | 2013-05-06 | 1 | -1/+1 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #10467 from akalyaev/set-correct-backend-for-nokogirisax-e... | Rafael Mendonça França | 2013-05-05 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | use nokogirisax as a backend | Anton Kalyaev | 2013-05-05 | 1 | -3/+3 | |
* | | | | | | | | | Merge pull request #10476 from prathamesh-sonpatki/gitignore | Rafael Mendonça França | 2013-05-05 | 3 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Updated link to to GitHub article about ignoring files [ci skip] | Prathamesh Sonpatki | 2013-05-05 | 3 | -3/+3 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #10466 from prathamesh-sonpatki/scaffold-assets | Carlos Antonio da Silva | 2013-05-05 | 1 | -4/+4 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fixes warning 'method redefined' in scaffold generators tests | Prathamesh Sonpatki | 2013-05-05 | 1 | -4/+4 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge pull request #10468 from rimidl/add-missing-require-to-actionview-looku... | Carlos Antonio da Silva | 2013-05-05 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Added missing `require` to ActionView::LookupContext | Vladimir Strakhov | 2013-05-05 | 1 | -0/+1 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge pull request #10472 from prathamesh-sonpatki/github | Carlos Antonio da Silva | 2013-05-05 | 4 | -14/+14 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Github -> GitHub [ci skip] | Prathamesh Sonpatki | 2013-05-05 | 4 | -14/+14 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #10465 from raphweiner/rake_install_depend_on_build | Rafael Mendonça França | 2013-05-04 | 1 | -1/+1 | |
* | | | | | | | Merge pull request #10464 from arkiver/master | Rafael Mendonça França | 2013-05-04 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | fix to remove warning on postgres adapter test. | Akshay Khole | 2013-05-05 | 1 | -1/+1 | |
| * | | | | | | | Changing method call according to coding conventions | Akshay Khole | 2013-05-05 | 1 | -1/+1 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #10463 from prathamesh-sonpatki/dir | Rafael Mendonça França | 2013-05-04 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | dir -> directory [ci skip] | Prathamesh Sonpatki | 2013-05-04 | 1 | -1/+1 | |
|/ / / / / / / | ||||||
* | | | | | | | Use Ruby 1.9 syntax | Rafael Mendonça França | 2013-05-04 | 1 | -2/+2 | |
* | | | | | | | Review the CHANGELOG entry [ci skip] | Rafael Mendonça França | 2013-05-04 | 1 | -1/+2 |