Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #15041 from arthurnn/update_ruby | Guillermo Iguaran | 2014-05-09 | 1 | -1/+1 |
|\ | | | | | Use ruby 2.1.2 on travis | ||||
| * | Use ruby 2.1.2 on travis | Arthur Neves | 2014-05-09 | 1 | -1/+1 |
|/ | |||||
* | add tests for path based url_for calls | Aaron Patterson | 2014-05-08 | 1 | -2/+19 |
| | |||||
* | don't manipulate the testclass, just add helpers to the instance | Aaron Patterson | 2014-05-08 | 1 | -10/+11 |
| | |||||
* | add a test for classes with options | Aaron Patterson | 2014-05-08 | 1 | -0/+7 |
| | |||||
* | add tests for the polymorphic_path method | Aaron Patterson | 2014-05-08 | 1 | -0/+3 |
| | |||||
* | Merge pull request #15030 from mechanicles/a-to-an | Rafael Mendonça França | 2014-05-08 | 1 | -1/+1 |
|\ | | | | | Change 'a' to 'an' [ci skip] | ||||
| * | Change 'a' to 'an' [ci skip] | Santosh Wadghule | 2014-05-09 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #15029 from JuanitoFatas/docpatch/routing | Rafael Mendonça França | 2014-05-08 | 1 | -11/+11 |
|\ \ | |/ |/| | [ci skip] Minor improvements on routing.md. | ||||
| * | [ci skip] Minor improvements on routing.md. | Juanito Fatas | 2014-05-09 | 1 | -11/+11 |
| | | |||||
* | | add more tests around the polymorphic url api | Aaron Patterson | 2014-05-08 | 1 | -0/+12 |
| | | |||||
* | | set a constant for the "anonymous" habtm model fixes #15022 | Aaron Patterson | 2014-05-08 | 2 | -0/+11 |
| | | | | | | | | | | I wanted the middle model to be anonymous, but we have to give it a name for marshal support. :'( | ||||
* | | test, regression test for unparsable PostgreSQL defaults. | Yves Senn | 2014-05-08 | 1 | -0/+17 |
| | | | | | | | | | | This test was inspired by #14866. That PR would break this functionality and we should make sure we notice that in the future. | ||||
* | | Merge pull request #14992 from fredwu/habtm_relation_size_calculation_fix | Carlos Antonio da Silva | 2014-05-08 | 4 | -1/+30 |
|\ \ | | | | | | | Habtm relation size calculation fix. Fixes #14913, Fixes #14914. | ||||
| * | | Fixed HABTM's CollectionAssociation size | Fred Wu | 2014-05-08 | 4 | -1/+30 |
| | | | | | | | | | | | | | | | HABTM should fall back to using the normal CollectionAssociation's size calculation if the collection is not cached or loaded. This addresses both #14913 and #14914 for master. | ||||
* | | | test, reset changed state in PG's uuid tests. | Yves Senn | 2014-05-08 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This resulted in some unrelated errors on Traivs: 1) Error: PostgresqlUUIDTest#test_treat_blank_uuid_as_nil: ActiveRecord::StatementInvalid: PG::UndefinedColumn: ERROR: column "thingy" of relation "uuid_data_type" does not exist LINE 1: INSERT INTO "uuid_data_type" ("thingy") VALUES ($1) RETURNIN... ^ : INSERT INTO "uuid_data_type" ("thingy") VALUES ($1) RETURNING "id" /cc @zuhao | ||||
* | | | pg guide, inet code example. [ci skip] | Yves Senn | 2014-05-08 | 1 | -3/+29 |
|/ / | |||||
* | | Merge pull request #15020 from ivantsepp/contributing_to_rails_guide_fix | Godfrey Chan | 2014-05-07 | 1 | -1/+1 |
|\ \ | | | | | | | Mismatch branch name between text and code example [ci skip] | ||||
| * | | Branch name should match in text and code example. | Ivan Tse | 2014-05-08 | 1 | -1/+1 |
|/ / | | | | | | | [ci skip] | ||||
* | | Merge pull request #15016 from arthurnn/dup_attr_on_save_state | Godfrey Chan | 2014-05-07 | 1 | -1/+1 |
|\ \ | | | | | | | Dup the changed_attributes otherwise we could lose them | ||||
| * | | Dup the changed_attributes otherwise we could lose them | Arthur Neves | 2014-05-07 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #15015 from pothibo/database-configuration | Rafael Mendonça França | 2014-05-07 | 3 | -1/+22 |
|\ \ | | | | | | | Use Rails::Paths::Path#existent in database_configuration | ||||
| * | | Use Rails::Paths::Path#existent in database_configuration | Pier-Olivier Thibault | 2014-05-07 | 3 | -1/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Database configuration was trying to load the first path that config.paths['config/database'] was returning even if the path didn't exist in the filesystem. Because Rails::Paths::Path has the possibility to return more than 1 path (as an array), database_configuration should filter down the paths to the existing one and then load the first one. This would make it possible to move the database.yml file and add the new path to paths['config/database'] and still load the configurations. | ||||
* | | | Add CHANGELOG entry for #14989 | Rafael Mendonça França | 2014-05-07 | 1 | -0/+5 |
| | | | | | | | | | | | | Closes #14989 | ||||
* | | | Return a non zero code when db has never been setup on status | Paul B | 2014-05-07 | 2 | -3/+2 |
| | | | |||||
* | | | Merge pull request #12746 from coreyward/master | Rafael Mendonça França | 2014-05-07 | 2 | -15/+36 |
|\ \ \ | | | | | | | | | | | | | Fix Hash#deep_merge bug and improve documentation — resolves #12738 | ||||
| * | | | Fix Hash#deep_merge bug and improve documentation — resolves #12738 | Corey Ward | 2013-12-09 | 2 | -11/+31 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously merging into a hash with a falsy value would not result in the merge-block being called. The fix is simply to check for presence of the key in the hash. The documentation example for `deep_merge` now appropriately demonstrates what a deep merge does. | ||||
* | | | | Merge branch 'rm-trasaction-fix-13166' | Rafael Mendonça França | 2014-05-07 | 3 | -0/+52 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Keep track of dirty attrs after after rollback. | Arthur Neves | 2014-05-07 | 4 | -20/+11 |
| | | | | | | | | | | | | | | | | [related #13166] | ||||
| * | | | Merge pull request #13166 from bogdan/transaction-magic | Rafael Mendonça França | 2014-05-07 | 3 | -1/+62 |
|/| | | | | | | | | | | | | | | | [Regression 3.2 -> 4.0] Fix bugs with changed attributes tracking when transaction gets rollback | ||||
| * | | | Fix bugs with changed attributes tracking when transaction gets rollback | Bogdan Gusiev | 2013-12-04 | 3 | -1/+62 |
| | | | | |||||
* | | | | Merge pull request #15012 from schneems/schneems/headers-key | Yves Senn | 2014-05-07 | 2 | -1/+5 |
|\ \ \ \ | | | | | | | | | | | HTTP::Headers#key? correctly converts | ||||
| * | | | | HTTP::Headers#key? correctly converts | schneems | 2014-05-07 | 2 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously if you were looking for a given key, the header may incorrectly tell you that it did not exist even though it would return a valid value: ```ruby env = { "CONTENT_TYPE" => "text/plain" } headers = ActionDispatch::Http::Headers.new(env) headers["Content-Type"] # => "text/plain" headers.key?("Content-Type") # => false ``` This PR fixes that behavior by converting the key before checking for presence | ||||
* | | | | | test for inconsistency between String and Symbol url_for handling | Aaron Patterson | 2014-05-07 | 1 | -0/+4 |
| | | | | | |||||
* | | | | | add tests for symbols passed to polymorphic_url | Aaron Patterson | 2014-05-07 | 1 | -0/+12 |
|/ / / / | |||||
* | | | | test, persist inherited class with different table name. Refs #14971. | Yves Senn | 2014-05-07 | 1 | -0/+14 |
| | | | | | | | | | | | | | | | | | | | | This case prevents against regressions. The change was suggested in a recent PR but the all our tests passed. | ||||
* | | | | Merge pull request #15002 from vanderhoop/master | Arthur Neves | 2014-05-07 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | | | | | | typo fixes in active_record_basics.md [skip ci] | ||||
| * | | | | fixed typos in active_record basics [skip ci] | vanderhoop | 2014-05-07 | 1 | -2/+2 |
|/ / / / | |||||
* | | | | Merge pull request #14964 from zuhao/refactor_actionmailer_tests | Yves Senn | 2014-05-07 | 1 | -102/+157 |
|\ \ \ \ | | | | | | | | | | | WIP: Make ActionMailer tests order-independent. | ||||
| * | | | | Fix state leaks in actionmailer/test/base_test.rb. | Zuhao Wan | 2014-05-07 | 1 | -102/+157 |
| | | | | | |||||
* | | | | | Merge pull request #15007 from vipulnsward/fix-scrubber-overshadow | Yves Senn | 2014-05-07 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | rename var to fix overshadowing of variable | ||||
| * | | | | | rename `str` to `string` to fix overshadowing of variable | Vipul A M | 2014-05-07 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #14993 from jonatack/patch-7 | Yves Senn | 2014-05-07 | 1 | -10/+9 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Follow-up to #14990 [ci skip] | ||||
| * | | | | | | Follow-up to #14990 [ci skip] | Jon Atack | 2014-05-07 | 1 | -10/+9 |
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rewrite to avoid 'we'/'you', add missing period, and keep lines at 80 chars. Cheers :) Improve readability with help from @senny [ci skip] | ||||
* / / / / / | Update links to new rails version in guides [ci skip] | Arun Agrawal | 2014-05-07 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #15004 from JuanitoFatas/patch/ar-pg | Yves Senn | 2014-05-07 | 1 | -3/+12 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | [ci skip] Add feature section and normalize prologue with other guides. | ||||
| * | | | | [ci skip] Add feature section and normalize prologue with other guides. | Juanito Fatas | 2014-05-07 | 1 | -3/+12 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | Also change Json => JSON. Fill Ruby's Range & IPAddr link. | ||||
* | | | | apparently passing a string to polymorphic_url is something we support | Aaron Patterson | 2014-05-06 | 1 | -0/+12 |
| | | | | | | | | | | | | | | | | o_O | ||||
* | | | | make sure url_for works similar to polymorphic_url | Aaron Patterson | 2014-05-06 | 1 | -38/+43 |
| | | | | |||||
* | | | | add a test for the parameters sent to the url helper for new records | Aaron Patterson | 2014-05-06 | 1 | -0/+15 |
| | | | |