Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | Add bare actionview gem to the root directory | Piotr Sarnacki | 2013-06-20 | 9 | -2/+147 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #11020 from fredwu/master-activemodel-inclusion-chain-fix-iii | Rafael Mendonça França | 2013-06-20 | 2 | -6/+16 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | ActiveModel::Model inclusion chain backward compatibility | Fred Wu | 2013-06-20 | 2 | -6/+16 | |
* | | | | | | | | Merge pull request #11024 from pdorrell/master | Xavier Noria | 2013-06-20 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | fix "will be ran" and "has began" typos in configuration guide | Philip Dorrell | 2013-06-20 | 1 | -3/+3 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #11017 from stormsilver/patch-1 | Yves Senn | 2013-06-19 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Fix name of nested attributes option include_id | Eric Hankins | 2013-06-19 | 1 | -2/+2 | |
|/ / / / / / | ||||||
* | | | | | | add forgotten CHANGELOG entry for #10884. | Yves Senn | 2013-06-19 | 1 | -0/+5 | |
* | | | | | | Merge pull request #10884 from dmarkow/pg_fix_default_quotes | Yves Senn | 2013-06-19 | 2 | -1/+26 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Handle single quotes in PostgreSQL default column values | Dylan Markow | 2013-06-19 | 2 | -1/+26 | |
* | | | | | | | Fixes AciveModel::Model with no ancestors, fixes #11004 | Fred Wu | 2013-06-19 | 2 | -3/+24 | |
* | | | | | | | Revert "Merge pull request #10566 from neerajdotname/10509d" | Jon Leighton | 2013-06-19 | 3 | -25/+1 | |
* | | | | | | | add documentation for `ActiveSupport::Testing::SetupAndTeardown`. | Yves Senn | 2013-06-19 | 1 | -2/+17 | |
* | | | | | | | Merge pull request #10991 from neerajdotname/10982 | Yves Senn | 2013-06-19 | 3 | -1/+19 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | log the sql that is actually sent to the database | Neeraj Singh | 2013-06-19 | 3 | -1/+19 | |
|/ / / / / / / | ||||||
* | | | | | | | better documentation for `AS::Testing::Declarative#test`. [ci skip] | Yves Senn | 2013-06-19 | 1 | -3/+6 | |
* | | | | | | | Merge pull request #11007 from ugisozols/remove_duplicate_letter | Yves Senn | 2013-06-19 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Remove duplicate letter 'a'. [ci skip] | Uģis Ozols | 2013-06-19 | 1 | -1/+1 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #11002 from fredwu/master-activemodel-inclusion-chain-fix | José Valim | 2013-06-18 | 2 | -0/+14 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fixed ActiveModel::Model's inclusion chain | Fred Wu | 2013-06-19 | 2 | -0/+14 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #10566 from neerajdotname/10509d | Jon Leighton | 2013-06-18 | 3 | -1/+25 | |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | ||||||
| * | | | | | | do not load all child records for inverse case | Neeraj Singh | 2013-06-19 | 3 | -1/+25 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #10998 from Empact/tidy-changelog | Steve Klabnik | 2013-06-18 | 1 | -24/+26 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix formatting of my name in the changelog, and given Aaron credit for b483a0... | Ben Woosley | 2013-06-18 | 1 | -1/+3 | |
| * | | | | | | It takes 4 spaces or some backticks to have this code displayed as code in th... | Ben Woosley | 2013-06-18 | 1 | -23/+23 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #10988 from tute/master | Yves Senn | 2013-06-18 | 1 | -2/+6 | |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | ||||||
| * | | | | | Add `respond_with` `location` option to the docs | Tute Costa | 2013-06-18 | 1 | -2/+6 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #10987 from senny/10979_association_include_returns_true | Xavier Noria | 2013-06-18 | 2 | -12/+12 | |
|\ \ \ \ \ | ||||||
| * | | | | | `CollectionProxy#include?` returns `true` and `false` as documented. | Yves Senn | 2013-06-18 | 2 | -12/+12 | |
* | | | | | | Merge pull request #10986 from wangjohn/changing_rails_env_config | José Valim | 2013-06-17 | 1 | -24/+7 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Removing a repetitive comment and removing a deprecation warning. | wangjohn | 2013-06-17 | 1 | -24/+7 | |
|/ / / / / / | ||||||
* | | | | | | Revert "Merge pull request #10961 from wangjohn/changing_rails_env_config" | Santiago Pastorino | 2013-06-17 | 1 | -7/+24 | |
* | | | | | | we only support 1.9+, so just check for a name | Aaron Patterson | 2013-06-17 | 1 | -1/+1 | |
* | | | | | | be consistent about parameter types passed to new_constants_in | Aaron Patterson | 2013-06-17 | 1 | -1/+1 | |
* | | | | | | Merge pull request #10968 from wangjohn/refactoring_rails_application_class | Santiago Pastorino | 2013-06-17 | 2 | -95/+109 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Creating a class to build the default middleware stack. | wangjohn | 2013-06-16 | 2 | -95/+109 | |
* | | | | | | | load the file rather than evaling | Aaron Patterson | 2013-06-17 | 1 | -1/+1 | |
* | | | | | | | Merge pull request #10961 from wangjohn/changing_rails_env_config | Santiago Pastorino | 2013-06-17 | 1 | -24/+7 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Removing a repetitive comment and refactoring the Application class in | wangjohn | 2013-06-16 | 1 | -24/+7 | |
| | |_|_|_|/ / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #10902 from wangjohn/removing_application_singleton_calls | Santiago Pastorino | 2013-06-17 | 12 | -23/+23 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Calls to the application constant have been refactored to use | wangjohn | 2013-06-10 | 12 | -23/+23 | |
* | | | | | | | | just construct real objects rather than mock and stub | Aaron Patterson | 2013-06-17 | 1 | -7/+8 | |
* | | | | | | | | Merge branch 'master' into mrbrdo-fixserialization | Aaron Patterson | 2013-06-17 | 153 | -573/+1159 | |
|\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | Merge pull request #10970 from sbagdat/patch-1 | Rafael Mendonça França | 2013-06-17 | 4 | -9/+10 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | Use Colspan in th Tags | Sıtkı Bağdat | 2013-06-17 | 4 | -9/+10 | |
| * | | | | | | | | | Merge pull request #10971 from dtaniwaki/escape_link_to_unless | Rafael Mendonça França | 2013-06-17 | 2 | -1/+6 | |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | ||||||
| | * | | | | | | | | Added test for link_to_unless to make sure the result consistency. | dtaniwaki | 2013-06-16 | 1 | -0/+5 | |
| | * | | | | | | | | Escape the string even when the condition of link_to_unless is not satisfied. | dtaniwaki | 2013-06-16 | 1 | -1/+1 | |
| * | | | | | | | | | Merge pull request #10942 from yangchenyun/mine | Yves Senn | 2013-06-16 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | / / | | | |_|_|_|_|/ / | | |/| | | | | | | ||||||
| | * | | | | | | | correct documentation about active_record behavior | Steven Yang | 2013-06-15 | 1 | -2/+2 |