Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Merge pull request #3305 from cjolly/request_filtered_env | Jeremy Kemper | 2012-02-13 | 2 | -1/+34 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Exclude rack.request.form_vars from request.filtered_env | Chad Jolly | 2012-01-18 | 2 | -1/+34 | |
* | | | | | | Merge pull request #5031 from carlosantoniodasilva/sprockets-compressors-refa... | Jeremy Kemper | 2012-02-13 | 3 | -23/+25 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Use Hash#fetch instead of testing for #key? | Carlos Antonio da Silva | 2012-02-13 | 2 | -3/+3 | |
| * | | | | | | Refactor sprockets compressors module | Carlos Antonio da Silva | 2012-02-13 | 1 | -20/+22 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #5026 from castlerock/remove_require_for_string_encoding | Santiago Pastorino | 2012-02-13 | 2 | -2/+0 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | remove unwanted require for string encoding | Vishnu Atrai | 2012-02-13 | 2 | -2/+0 | |
* | | | | | | | Merge pull request #4834 from sskirby/fix_usage_of_psql_in_db_test_prepare | Aaron Patterson | 2012-02-13 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | fixes rake db:test:prepare when using postgresql with sql db structure file a... | Sean Kirby | 2012-02-01 | 1 | -1/+1 | |
* | | | | | | | | Merge pull request #5000 from flavorpill/master-with-multidb-association-fix | Aaron Patterson | 2012-02-13 | 11 | -10/+40 | |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | ||||||
| * | | | | | | | fix associations when using per class databases | Lars Kanis | 2012-02-10 | 3 | -8/+5 | |
| * | | | | | | | added test for #3732 | Rick Martinez | 2012-02-10 | 8 | -2/+35 | |
* | | | | | | | | Merge pull request #5012 from waseem/alias-reconnect-mysql2 | Aaron Patterson | 2012-02-13 | 1 | -5/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Alias reconnect! to reset! for Mysql2 adapter since they have same | Waseem Ahmad | 2012-02-12 | 1 | -5/+1 | |
* | | | | | | | | | Merge pull request #5018 from hammerdr/issue-4659-docs | Aaron Patterson | 2012-02-13 | 1 | -4/+7 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Missed a code example. Fixing the docs to be consistant. | Derek Hammer | 2012-02-12 | 1 | -1/+1 | |
| * | | | | | | | | | Adding documentation to clarify usage of attributes hash. | Derek Hammer | 2012-02-12 | 1 | -3/+6 | |
* | | | | | | | | | | Merge pull request #5024 from carlosantoniodasilva/amo-serializable-hash-stri... | José Valim | 2012-02-13 | 2 | -46/+45 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Make sure serializable hash with :methods option returns always string keys | Carlos Antonio da Silva | 2012-02-13 | 2 | -4/+4 | |
| * | | | | | | | | | | Cleanup extra spaces | Carlos Antonio da Silva | 2012-02-13 | 1 | -45/+44 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #5016 from exviva/form_helper_date_fields | José Valim | 2012-02-12 | 9 | -5/+82 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Add HTML5 input[type="date"] helper | Olek Janiszewski | 2012-02-12 | 9 | -5/+82 | |
* | | | | | | | | | | | Merge pull request #5021 from tchandy/clean_controller_tests | José Valim | 2012-02-12 | 3 | -39/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Removing old Controller test | Thiago Pradi | 2012-02-12 | 3 | -39/+0 | |
| | |/ / / / / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | prefer tr to gsub for replacing characters | Xavier Noria | 2012-02-12 | 1 | -2/+2 | |
* | | | | | | | | | | | inflection regexp are meant to be applied once | Xavier Noria | 2012-02-12 | 1 | -2/+2 | |
* | | | | | | | | | | | removes redundant argument | Xavier Noria | 2012-02-12 | 1 | -1/+1 | |
* | | | | | | | | | | | boosts inflections | Xavier Noria | 2012-02-12 | 1 | -1/+1 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #5015 from castlerock/revert_PR_5001_fix_isolated_test_run | José Valim | 2012-02-12 | 4 | -0/+5 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Revert PR#5001 "removed unuseful require for reply as we are not using requir... | Vishnu Atrai | 2012-02-12 | 4 | -0/+5 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #5014 from castlerock/fix_build_PR_5001 | Xavier Noria | 2012-02-12 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | fix build 5001, model reply is required in cases/primary_keys_test too! | Vishnu Atrai | 2012-02-12 | 1 | -0/+1 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #5013 from castlerock/fix_build_pull_5001 | José Valim | 2012-02-12 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | fix build #5001 reply model required in relations_test | Vishnu Atrai | 2012-02-12 | 1 | -0/+1 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #5010 from tchandy/clean_routing_tests | José Valim | 2012-02-11 | 2 | -58/+2 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Cleaning Route generation tests | Thiago Pradi | 2012-02-12 | 2 | -58/+2 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #5006 from lest/patch-1 | Xavier Noria | 2012-02-11 | 2 | -1/+7 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | handle id attribute in PrimaryKey module | Sergey Nartimov | 2012-02-11 | 2 | -1/+7 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #5003 from kennyj/fix_warning_20120211 | Santiago Pastorino | 2012-02-11 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fix warning: The method name is a duplicate and wrong. | kennyj | 2012-02-11 | 1 | -1/+1 | |
* | | | | | | | | | Merge pull request #5001 from Karunakar/no_reply_requires | Xavier Noria | 2012-02-11 | 6 | -7/+0 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | removed unuseful require for reply as we are not using require model | Karunakar (Ruby) | 2012-02-11 | 6 | -7/+0 | |
|/ / / / / / / / / | ||||||
* / / / / / / / / | say unshift when you mean unshift (modulus prepend) | Xavier Noria | 2012-02-11 | 2 | -4/+8 | |
|/ / / / / / / / | ||||||
* | | | | | | | | say goodbye to #with_test_routes :axe: | Xavier Noria | 2012-02-10 | 1 | -1166/+947 | |
* | | | | | | | | fixes a regression introduced by 532cd4, and a bogus test in AP the regressio... | Xavier Noria | 2012-02-10 | 3 | -8/+10 | |
* | | | | | | | | Merge branch 'master' into instance_reader | Aaron Patterson | 2012-02-10 | 2 | -6/+15 | |
|\| | | | | | | | ||||||
| * | | | | | | | Merge pull request #4719 from markmcspadden/singularize_words_that_end_in_ss | Xavier Noria | 2012-02-10 | 2 | -6/+15 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | Add Inflection test (and fixes) to ensure singularizing a singular actually g... | Mark McSpadden | 2012-01-27 | 2 | -6/+15 | |
* | | | | | | | | | PG column consults oid types when typecasting | Aaron Patterson | 2012-02-10 | 5 | -10/+34 | |
* | | | | | | | | | dynamically populate casting objects via the pg_type table | Aaron Patterson | 2012-02-10 | 2 | -35/+74 |