aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge pull request #15044 from zzak/travis_ruby_too_wonRafael Mendonça França2014-05-091-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Only need MINOR version level to test Ruby 2.1.x on Travis
| * | | | | Only need MINOR version level to test Ruby 2.1.x on TravisZachary Scott2014-05-091-1/+1
|/ / / / / | | | | | | | | | | | | | | | cc http://blog.travis-ci.com/2014-04-28-upcoming-build-environment-updates/
* | | | | Merge pull request #15042 from arthurnn/revert_dirty_transactionsRafael Mendonça França2014-05-093-52/+0
|\ \ \ \ \ | | | | | | | | | | | | Reverts dirty track restore on transactions rollback
| * | | | | Reverts "Fix bugs with changed attributes tracking when transaction gets ↵Arthur Neves2014-05-093-52/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rollback" We are reverting these commits, because there are other caveats related to dirty attributes not being restored when a transaction is rollback. For instance, nested transactions cannot proper restore the dirty attributes state after a rollback. At the moment, the dirty attributes are scoped by the transaction. When we call `.save` on a record, the dirty attributes will be reset even if the transaction gets rollback. [related #13166] [related #15018] [related #15016] [closes #15019] This reverts commits * bab48f0a3d53a08bc23ea0887219e8deb963c3d9 * b0fa7cf3ff8432cc2eef3682b34763b7f8c93cc8. * 73fb39b6faa9de593ae75ad4e3b8e065ea0e53af * 37c238927fbed059de3f26a90d8923fb377568a5. * 8d8d4f1560264cd1c74364d67fa0501f6dd2c4fa Revert "Merge pull request #13166 from bogdan/transaction-magic"
* | | | | | just call the method and assert the return valueAaron Patterson2014-05-091-8/+1
|/ / / / / | | | | | | | | | | | | | | | do not test internals
* | | | | Merge pull request #15041 from arthurnn/update_rubyGuillermo Iguaran2014-05-091-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Use ruby 2.1.2 on travis
| * | | | | Use ruby 2.1.2 on travisArthur Neves2014-05-091-1/+1
|/ / / / /
* | | | | add tests for path based url_for callsAaron Patterson2014-05-081-2/+19
| | | | |
* | | | | don't manipulate the testclass, just add helpers to the instanceAaron Patterson2014-05-081-10/+11
| | | | |
* | | | | add a test for classes with optionsAaron Patterson2014-05-081-0/+7
| | | | |
* | | | | add tests for the polymorphic_path methodAaron Patterson2014-05-081-0/+3
| | | | |
* | | | | Merge pull request #15030 from mechanicles/a-to-anRafael Mendonça França2014-05-081-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Change 'a' to 'an' [ci skip]
| * | | | | Change 'a' to 'an' [ci skip]Santosh Wadghule2014-05-091-1/+1
| | | | | |
* | | | | | Merge pull request #15029 from JuanitoFatas/docpatch/routingRafael Mendonça França2014-05-081-11/+11
|\ \ \ \ \ \ | |/ / / / / |/| | | | | [ci skip] Minor improvements on routing.md.
| * | | | | [ci skip] Minor improvements on routing.md.Juanito Fatas2014-05-091-11/+11
| | | | | |
* | | | | | add more tests around the polymorphic url apiAaron Patterson2014-05-081-0/+12
| | | | | |
* | | | | | set a constant for the "anonymous" habtm model fixes #15022Aaron Patterson2014-05-082-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 Senn2014-05-081-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_fixCarlos Antonio da Silva2014-05-084-1/+30
|\ \ \ \ \ \ | | | | | | | | | | | | | | Habtm relation size calculation fix. Fixes #14913, Fixes #14914.
| * | | | | | Fixed HABTM's CollectionAssociation sizeFred Wu2014-05-084-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 Senn2014-05-081-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 Senn2014-05-081-3/+29
|/ / / / / /
* | | | | | Merge pull request #15020 from ivantsepp/contributing_to_rails_guide_fixGodfrey Chan2014-05-071-1/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Mismatch branch name between text and code example [ci skip]
| * | | | | Branch name should match in text and code example.Ivan Tse2014-05-081-1/+1
|/ / / / / | | | | | | | | | | | | | | | [ci skip]
* | | | | Merge pull request #15016 from arthurnn/dup_attr_on_save_stateGodfrey Chan2014-05-071-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Dup the changed_attributes otherwise we could lose them
| * | | | | Dup the changed_attributes otherwise we could lose themArthur Neves2014-05-071-1/+1
|/ / / / /
* | | | | Merge pull request #15015 from pothibo/database-configurationRafael Mendonça França2014-05-073-1/+22
|\ \ \ \ \ | | | | | | | | | | | | Use Rails::Paths::Path#existent in database_configuration
| * | | | | Use Rails::Paths::Path#existent in database_configurationPier-Olivier Thibault2014-05-073-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 #14989Rafael Mendonça França2014-05-071-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Closes #14989
* | | | | | Return a non zero code when db has never been setup on statusPaul B2014-05-072-3/+2
| | | | | |
* | | | | | Merge pull request #12746 from coreyward/masterRafael Mendonça França2014-05-072-15/+36
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fix Hash#deep_merge bug and improve documentation — resolves #12738
| * | | | | | Fix Hash#deep_merge bug and improve documentation — resolves #12738Corey Ward2013-12-092-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ça2014-05-073-0/+52
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Keep track of dirty attrs after after rollback.Arthur Neves2014-05-074-20/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [related #13166]
| * | | | | | Merge pull request #13166 from bogdan/transaction-magicRafael Mendonça França2014-05-073-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 rollbackBogdan Gusiev2013-12-043-1/+62
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #15012 from schneems/schneems/headers-keyYves Senn2014-05-072-1/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | HTTP::Headers#key? correctly converts
| * | | | | | HTTP::Headers#key? correctly convertsschneems2014-05-072-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 handlingAaron Patterson2014-05-071-0/+4
| | | | | | |
* | | | | | | add tests for symbols passed to polymorphic_urlAaron Patterson2014-05-071-0/+12
|/ / / / / /
* | | | | | test, persist inherited class with different table name. Refs #14971.Yves Senn2014-05-071-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/masterArthur Neves2014-05-071-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | typo fixes in active_record_basics.md [skip ci]
| * | | | | | fixed typos in active_record basics [skip ci]vanderhoop2014-05-071-2/+2
|/ / / / / /
* | | | | | Merge pull request #14964 from zuhao/refactor_actionmailer_testsYves Senn2014-05-071-102/+157
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | WIP: Make ActionMailer tests order-independent.
| * | | | | Fix state leaks in actionmailer/test/base_test.rb.Zuhao Wan2014-05-071-102/+157
| | | | | |
* | | | | | Merge pull request #15007 from vipulnsward/fix-scrubber-overshadowYves Senn2014-05-071-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | rename var to fix overshadowing of variable
| * | | | | | rename `str` to `string` to fix overshadowing of variableVipul A M2014-05-071-1/+1
| | | | | | |
* | | | | | | Merge pull request #14993 from jonatack/patch-7Yves Senn2014-05-071-10/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Follow-up to #14990 [ci skip]
| * | | | | | | Follow-up to #14990 [ci skip]Jon Atack2014-05-071-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 Agrawal2014-05-071-1/+1
|/ / / / / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 19:26:18 +0000