Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | 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] | 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 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] | Saulius Grigaliunas | 2013-11-13 | 1 | -1/+1 | |
* | | | | | | | | 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 | |
* | | | | | | | 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. | 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? | Ben Woosley | 2013-11-12 | 1 | -5/+0 | |
| * | | | | | | Drop a sqlite_version check because we only support SQLite 3.6.16 or newer. | Ben Woosley | 2013-11-12 | 2 | -7/+1 | |
|/ / / / / / | ||||||
* | | | | | | 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 | 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 | Roman Kushnir | 2013-11-11 | 2 | -0/+4 | |
* | | | | | | | | Merge pull request #12857 from kuldeepaggarwal/f-indentation | Xavier Noria | 2013-11-11 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | 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 | 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 | |
|\| | | | | | | | ||||||
| * | | | | | | | 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 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Prevent the counter cache from being decremented twice | dm1try | 2013-11-11 | 3 | -1/+17 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #12815 from Adam89/patch-1 | Xavier Noria | 2013-11-11 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Update security.md | Adam | 2013-11-08 | 1 | -1/+1 | |
* | | | | | | | | | Merge pull request #12425 from senny/mysql_booleans | Yves Senn | 2013-11-11 | 4 | -6/+104 | |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | 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 | Jimmy Petersen | 2013-11-11 | 1 | -1/+1 | |
|/ / / / / / / / | ||||||
* | | | | | | | | 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 | |
* | | | | | | | | Load test fixtures where data are needed | Akira Matsuda | 2013-11-11 | 1 | -0/+2 | |
* | | | | | | | | 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 | Denis Redozubov | 2013-11-11 | 3 | -4/+26 | |
* | | | | | | | | | A tiny grammatical fix | Akira Matsuda | 2013-11-11 | 1 | -1/+1 | |
* | | | | | | | | | Merge pull request #12844 from akalyaev/bugfix/12835-autoload-change-column-d... | Rafael Mendonça França | 2013-11-11 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | 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] | 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 | KD | 2013-11-11 | 1 | -3/+3 | |
* | | | | | | | | | Merge pull request #12841 from kuldeepaggarwal/in-group-documentation | Yves Senn | 2013-11-10 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | |