Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | tests for merging Relations of different classes. | Yves Senn | 2013-11-13 | 1 | -0/+19 |
| | |||||
* | move Relation#merge tests into separate file. | Yves Senn | 2013-11-13 | 2 | -121/+131 |
| | |||||
* | Merge pull request #12870 from sauliusg/atom-feed-doc-fix | Yves Senn | 2013-11-13 | 1 | -1/+1 |
|\ | | | | | Fix syntax error in atom_feed example [ci skip] | ||||
| * | Fix syntax error in atom_feed example [ci skip] | Saulius Grigaliunas | 2013-11-13 | 1 | -1/+1 |
| | | | | | | | | Builder's #tag! takes either String or Symbol as the first parameter | ||||
* | | Ensure that a column added in a test is being removed after all | Akira Matsuda | 2013-11-13 | 1 | -0/+7 |
|/ | |||||
* | Revert "`remove_column` does not take a type argument. [ci skip]. Closes #12864" | Yves Senn | 2013-11-13 | 1 | -1/+1 |
| | | | | | | | As of Rails 4.0 `remove_column` is no longer an alias for `remove_columns`. The type is actually valid and used when issuing a rollback (new `change` method). This reverts commit 9c9d4948e428a226a19aa92c17fa6ac5833c2fb8. | ||||
* | Merge pull request #12865 from JuanitoFatas/layout-and-render | Carlos Antonio da Silva | 2013-11-12 | 1 | -4/+3 |
|\ | | | | | [ci skip] Fix curl response output and use strong parameters in update action | ||||
| * | [ci skip] Fix curl response output and use strong parameters in update action. | Juanito Fatas | 2013-11-13 | 1 | -4/+3 |
|/ | |||||
* | `remove_column` does not take a type argument. [ci skip]. Closes #12864 | Yves Senn | 2013-11-12 | 1 | -1/+1 |
| | |||||
* | Merge pull request #11921 from Empact/sqlite-3-cleanup | Yves Senn | 2013-11-12 | 2 | -12/+1 |
|\ | | | | | Remove the unused, undocumented SQLite3Adapter#supports_count_distinct? | ||||
| * | Remove the unused, undocumented SQLite3Adapter#supports_count_distinct? | Ben Woosley | 2013-11-12 | 1 | -5/+0 |
| | | | | | | | | This has returned true since 3cc9b5f1, and is not used internally. | ||||
| * | Drop a sqlite_version check because we only support SQLite 3.6.16 or newer. | Ben Woosley | 2013-11-12 | 2 | -7/+1 |
|/ | | | Drop some comments that document the implementation rather than the interface. | ||||
* | Merge pull request #12695 from mikepack/allow_pathnames | Yves Senn | 2013-11-11 | 3 | -1/+19 |
|\ | | | | | Allow Pathnames to be added to eager load paths | ||||
| * | Allow Pathnames to be added to eager load paths | Mike Pack | 2013-11-11 | 3 | -1/+19 |
| | | |||||
* | | Merge pull request #12851 from RKushnir/master | Yves Senn | 2013-11-11 | 2 | -0/+4 |
|\ \ | | | | | | | Include URL helpers in TestController in bug report templates [ci skip] | ||||
| * | | Include URL helpers in TestController in bug report templates | Roman Kushnir | 2013-11-11 | 2 | -0/+4 |
| | | | | | | | | | | | | | | | | | | [ci skip] Fixes #12848. | ||||
* | | | Merge pull request #12857 from kuldeepaggarwal/f-indentation | Xavier Noria | 2013-11-11 | 1 | -3/+3 |
|\ \ \ | | | | | | | | | updated documentation for Integer [ci skip] | ||||
| * | | | updated documentation for Integer | Kuldeep Aggarwal | 2013-11-12 | 1 | -3/+3 |
| | | | | |||||
* | | | | Merge pull request #12555 from EtienneLem/responsive-static-pages | Guillermo Iguaran | 2013-11-11 | 4 | -33/+54 |
|\ \ \ \ | |_|_|/ |/| | | | Make static error pages responsive | ||||
| * | | | Make static error pages responsive | Etienne Lemay | 2013-11-11 | 4 | -33/+54 |
|/ / / | |||||
* | | | Merge pull request #12854 from kuldeepaggarwal/f-indentation | Rafael Mendonça França | 2013-11-11 | 4 | -14/+18 |
|\| | | | | | | | | methods and outputs indented [ci skip] | ||||
| * | | documentation updated for Hashes [ci skip] | KD | 2013-11-11 | 4 | -14/+18 |
| | | | |||||
* | | | Merge pull request #12748 from dm1try/fix_counter_cache_for_through_association | Yves Senn | 2013-11-11 | 3 | -1/+17 |
|\ \ \ | | | | | | | | | Fixes #11079, prevent the counter cache from being decremented twice when destroying a record on a has_many :through association | ||||
| * | | | Prevent the counter cache from being decremented twice | dm1try | 2013-11-11 | 3 | -1/+17 |
|/ / / | | | | | | | | | | | | | when destroying a record on a has_many :through association. :destroy method has own counter_cache callbacks. | ||||
* | | | Merge pull request #12815 from Adam89/patch-1 | Xavier Noria | 2013-11-11 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Update security.md [ci skip] | ||||
| * | | | Update security.md | Adam | 2013-11-08 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Hi Guys I was reading through this guide last night and noticed a small mistake, would be great if you could update it. I changed the word 'building' to 'build' in line 20. "Web application frameworks are made to help developers building web applications" | ||||
* | | | | Merge pull request #12425 from senny/mysql_booleans | Yves Senn | 2013-11-11 | 4 | -6/+104 |
|\ \ \ \ | |_|_|/ |/| | | | Unify boolean quoting for Mysql- and Mysql2Adapter. | ||||
| * | | | Unifies mysql and mysql2 casting of booleans. | Yves Senn | 2013-11-11 | 4 | -9/+16 |
| | | | | |||||
| * | | | test cases to describe the MySQL boolean behavior. | Yves Senn | 2013-11-11 | 1 | -0/+91 |
|/ / / | |||||
* | | | Do not count "SHOW CREATE TABLE" queries when testing against mysql | Akira Matsuda | 2013-11-11 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #12847 from jipe/master | Xavier Noria | 2013-11-11 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Fixed typo in migrations guide [ci skip] | ||||
| * | | | Fixed typo in migrations guide | Jimmy Petersen | 2013-11-11 | 1 | -1/+1 |
|/ / / | | | | | | | | | | | | | Product model name was pluralized in example in migrations guide. [ci skip] | ||||
* | | | tidy Active Record CHANGELOG. [ci skip]. | Yves Senn | 2013-11-11 | 1 | -1/+3 |
| | | | |||||
* | | | Avoid sorting an Array including objects from different Classes | Akira Matsuda | 2013-11-11 | 1 | -1/+1 |
| | | | | | | | | | | | | addresses "ArgumentError: comparison of VerySpecialComment with SpecialComment failed" in ActiveRecord::DelegationRelationTest#test_#sort!_delegation_is_deprecated | ||||
* | | | Load test fixtures where data are needed | Akira Matsuda | 2013-11-11 | 1 | -0/+2 |
| | | | | | | | | | | | | Without this, some tests here were not actually testing anything. | ||||
* | | | Merge pull request #12834 from dredozubov/has_one_association_replacement | Yves Senn | 2013-11-11 | 3 | -4/+26 |
|\ \ \ | | | | | | | | | Fixes problem with replacing has_one association record with itself | ||||
| * | | | Fixes problem with replacing has_one association record with itself | Denis Redozubov | 2013-11-11 | 3 | -4/+26 |
| | | | | |||||
* | | | | A tiny grammatical fix | Akira Matsuda | 2013-11-11 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | [ci skip] | ||||
* | | | | Merge pull request #12844 from ↵ | Rafael Mendonça França | 2013-11-11 | 1 | -0/+1 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | akalyaev/bugfix/12835-autoload-change-column-definition autoload ChangeColumnDefinition (Fixes #12835) | ||||
| * | | | | autoload ChangeColumnDefinition (Fixes #12835) | Anton Kalyaev | 2013-11-11 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | Merge pull request #12843 from DeltaKilo/css_fix | Rafael Mendonça França | 2013-11-11 | 8 | -0/+20 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix missing line and shadow on static error pages [ci skip] | ||||
| * | | | | | Fix missing line and shadow on static error pages [ci skip] | Dmitry Korotkov | 2013-11-11 | 8 | -0/+20 |
| |/ / / / | |||||
* | | | | | Merge pull request #12842 from kuldeepaggarwal/array_split | Guillermo Iguaran | 2013-11-11 | 1 | -3/+3 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | Speed up Array#split when block is passed | ||||
| * | | | | Speed up Array#split | KD | 2013-11-11 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ruby 2.0.0p247 Rehearsal --------------------------------------- old 10.670000 0.150000 10.820000 ( 10.822651) new 8.520000 0.050000 8.570000 ( 8.571825) ----------------------------- total: 19.390000sec user system total real old 10.620000 0.170000 10.790000 ( 10.790409) new 8.570000 0.110000 8.680000 ( 8.686051) | ||||
* | | | | | Merge pull request #12841 from kuldeepaggarwal/in-group-documentation | Yves Senn | 2013-11-10 | 1 | -1/+1 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Array#in_groups: documentation updated [ci skip] | ||||
| * | | | | Array#in_groups: documentation updated | KD | 2013-11-11 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #12839 from kuldeepaggarwal/array_split | Guillermo Iguaran | 2013-11-10 | 2 | -8/+14 |
|\ \ \ \ \ | | |/ / / | |/| | | | Array#split preserving the calling array | ||||
| * | | | | Array#split preserving the calling array | KD | 2013-11-11 | 2 | -8/+14 |
| |/ / / | |||||
* | | | | Merge pull request #12838 from strzalek/remove_mime_type_order_var | Guillermo Iguaran | 2013-11-10 | 1 | -4/+3 |
|\ \ \ \ | | | | | | | | | | | Remove @order attribute from collector | ||||
| * | | | | Remove order attribute from collector | Lukasz Strzalkowski | 2013-11-10 | 1 | -4/+3 |
| | | | | | | | | | | | | | | | | | | | | Ruby 1.8 legacy. Since 1.9 hash preserves insertion order. No need for additional array to achieve this |