Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
* | | | | | Merge pull request #12740 from gaurish/patch-1 | Rafael Mendonça França | 2013-11-10 | 1 | -2/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | Improve Errors when Controller Name or Action isn't specfied | ||||
| * | | | | | Improve Errors when Controller Name or Action isn't specfied | Gaurish Sharma | 2013-11-05 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These errors occur when, there routes are wrongly defined. example, the following line would cause a missing :action error root "welcomeindex" Mostly beginners are expected to hit these errors, so lets improve the error message a bit to make their learning experience bit better. | ||||
* | | | | | | Merge pull request #12749 from iantropov/issue_5303 | Rafael Mendonça França | 2013-11-10 | 1 | -0/+4 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | Add test for ActiveRecord::Relation YAML serialization, for #5303 issue | ||||
| * | | | | | Add test for ActiveRecord::Relation YAML serialization, for #5303 issue | Ivan Antropov | 2013-11-03 | 1 | -0/+4 |
| | | | | | | |||||
* | | | | | | Merge pull request #10826 from sferik/update_tzinfo | Andrew White | 2013-11-10 | 2 | -1/+6 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | Update tzinfo | ||||
| * | | | | | Update tzinfo dependency to ~> 1.1 | Erik Michaels-Ober | 2013-11-10 | 2 | -1/+6 |
|/ / / / / | | | | | | | | | | | | | | | | Include the tzinfo-data in the generated Gemfile on Windows. | ||||
* | | / / | Use the method provided by minitest to make tests order dependent | Guillermo Iguaran | 2013-11-09 | 1 | -4/+2 |
| |_|/ / |/| | | | |||||
* | | | | use complete Relation API and not only `Model.all.merge!`. | Yves Senn | 2013-11-09 | 1 | -88/+83 |
| | | | | |||||
* | | | | Fixed minor typo | Jens Dahl Møllerhøj | 2013-11-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | instead of 'rake test' as shortcut, use 'rake'. Closes #12780 [ci skip] | ||||
* | | | | Change array check for better aesthetics / reading the code | Carlos Antonio da Silva | 2013-11-09 | 1 | -1/+1 |
| | | | | |||||
* | | | | Make the method name the first argument | Rafael Mendonça França | 2013-11-09 | 1 | -7/+7 |
| | | | | | | | | | | | | | | | | | | | | This is the only argument that changes over the method calls so it is better to it be the first one | ||||
* | | | | Drop one more string allocation | Rafael Mendonça França | 2013-11-09 | 1 | -1/+3 |
| | | | | |||||
* | | | | Merge pull request #12821 from arunagw/aa-removed-missleading-message | Yves Senn | 2013-11-09 | 2 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | clarified missleading message | ||||
| * | | | | Changed message for Model.inspect | Arun Agrawal | 2013-11-09 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (No database connection) sounds not be able to connect database. see more #12804 | ||||
* | | | | | improve Active Record Store docs when using PG types. [ci skip]. | Yves Senn | 2013-11-09 | 1 | -3/+4 |
| | | | | | |||||
* | | | | | Require the top file and autoload Base class | Rafael Mendonça França | 2013-11-09 | 3 | -3/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The generators entry point file is rails/generators so we need to make sure uers will be able to use the generators when requiring that file. Fixes #12802 | ||||
* | | | | | type casted PG bytea values are represented as a Hash. | Yves Senn | 2013-11-09 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This is a follow up to: 97f0d9a0dd12e7ad634815eecfeff866f64aad92 This change is also related to: df0edafac9eb47cd971970a9e7b13a3eaddf214e | ||||
* | | | | | Document the bind return | Rafael Mendonça França | 2013-11-09 | 1 | -0/+3 |
| | | | | | |||||
* | | | | | Avoid shot circuit return. | Rafael Mendonça França | 2013-11-09 | 1 | -8/+20 |
| | | | | | | | | | | | | | | | | | | | | This will make the conditional and to code clear | ||||
* | | | | | Improve changelogs formatting [ci skip] | Carlos Antonio da Silva | 2013-11-09 | 3 | -22/+22 |
| | | | | | |||||
* | | | | | Don't use Active Support where we don't need to | Rafael Mendonça França | 2013-11-09 | 3 | -3/+3 |
| | | | | | |||||
* | | | | | Fix typo in AR store docs [ci skip] | Carlos Antonio da Silva | 2013-11-09 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge pull request #12760 from pseidemann/master | Yves Senn | 2013-11-09 | 3 | -2/+11 |
|\ \ \ \ | | | | | | | | | | | fix simple_format escapes own output when sanitize is set to true |