| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #12832 from vipulnsward/move_schema_creation | Yves Senn | 2013-11-14 | 2 | -78/+84 |
| |\ | | | | | Move `SchemaCreation` to its own file instead of `AbstractAdapter`. | ||||
| | * | Move `SchemaCreation` to its own file instead of `AbstractAdapter`. | Vipul A M | 2013-11-12 | 2 | -78/+84 |
| | | | |||||
| * | | Merge pull request #12884 from akshay-vishnoi/refactor | Guillermo Iguaran | 2013-11-14 | 4 | -5/+5 |
| |\ \ | | | | | | | Ruby's new Hash syntax applied in actionmailer | ||||
| | * | | Ruby's new Hash syntax applied in actionmailer | Mr A | 2013-11-14 | 4 | -5/+5 |
| | | | | |||||
| * | | | Merge pull request #12845 from amatsuda/should_ar_depend_on_rails | Guillermo Iguaran | 2013-11-13 | 1 | -1/+5 |
| |\ \ \ | | | | | | | | | Refer to Rails.env from AR only when Rails is defined | ||||
| | * | | | Refer to Rails.env only when Rails is defined | Akira Matsuda | 2013-11-11 | 1 | -1/+5 |
| | | | | | |||||
| * | | | | Merge pull request #12883 from Amit-Thawait/master | Guillermo Iguaran | 2013-11-13 | 0 | -0/+0 |
| |\ \ \ \ | | | | | | | | | | | Updated guides link for 3.2.x to latest stable version 3.2.15 [ci skip] | ||||
| | * | | | | Updated guides link for 3.2.x to latest stable version 3.2.15 [skip-ci] | Amit Thawait | 2013-11-14 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Get rid of unused variable | Guillermo Iguaran | 2013-11-14 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Merge pull request #12882 from charliesome/use-rescue-splat-in-suppress | Guillermo Iguaran | 2013-11-13 | 1 | -2/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | Use rescue with a splat rather and catching all exceptions and manually filtering in Kernel#suppress | ||||
| | * | | | | | Use rescue with a splat rather and catching all and filtering | Charlie Somerville | 2013-11-13 | 1 | -2/+1 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #12874 from chancancode/better_as_loading_guides | Rafael Mendonça França | 2013-11-13 | 1 | -1/+4 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Make it clear that require 'active_support' is required [ci-skip] | ||||
| | * | | | | | | Make it clear that require 'active_support' is required [ci-skip] | Godfrey Chan | 2013-11-13 | 1 | -1/+4 |
| | | |_|_|/ / | |/| | | | | |||||
| * | | | | | | Merge pull request #12772 from dmathieu/no_touching | Rafael Mendonça França | 2013-11-13 | 5 | -0/+112 |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | Add No Touching | ||||
| | * | | | | | add #no_touching on ActiveRecord models | Damien Mathieu | 2013-11-13 | 5 | -0/+112 |
| | | | | | | | |||||
| * | | | | | | fix weird Emacs auto indentation. [ci skip] | Yves Senn | 2013-11-13 | 1 | -8/+8 |
| | | | | | | | |||||
| * | | | | | | 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 | ||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |