| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | Bump up version, fix module name | Łukasz Strzałkowski | 2013-06-20 | 1 | -4/+4 | |
| | | | | | ||||||
| | * | | | Adjust changelog for AV & AP | Łukasz Strzałkowski | 2013-06-20 | 2 | -36/+44 | |
| | | | | | ||||||
| | * | | | Remove heading from AV's CHANGELOG | Łukasz Strzałkowski | 2013-06-20 | 1 | -2/+0 | |
| | | | | | ||||||
| | * | | | Change from 'actionpack' to 'actionview' for locales path | Łukasz Strzałkowski | 2013-06-20 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | Fix isolated tests on AV | Łukasz Strzałkowski | 2013-06-20 | 1 | -3/+5 | |
| | | | | | ||||||
| | * | | | Add ActionView to CI | Łukasz Strzałkowski | 2013-06-20 | 2 | -2/+3 | |
| | | | | | ||||||
| | * | | | Template test were moved to AV | Łukasz Strzałkowski | 2013-06-20 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | Remove require to AP stuff that left | Łukasz Strzałkowski | 2013-06-20 | 2 | -2/+0 | |
| | | | | | ||||||
| | * | | | Fix digestor tests | Łukasz Strzałkowski | 2013-06-20 | 1 | -1/+2 | |
| | | | | | ||||||
| | * | | | Remove digestor fixtures from AP | Łukasz Strzałkowski | 2013-06-20 | 12 | -25/+0 | |
| | | | | | | | | | | | | | | | | | They were moved to actionview/ and are not used in actionpack | |||||
| | * | | | Copy company test fixture to AV (fixes failing test) | Łukasz Strzałkowski | 2013-06-20 | 1 | -0/+9 | |
| | | | | | ||||||
| | * | | | Remove unneeded test fixtures in AV | Piotr Sarnacki | 2013-06-20 | 237 | -558/+0 | |
| | | | | | ||||||
| | * | | | Add actionpack as actionview's development dependency | Piotr Sarnacki | 2013-06-20 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | | ActionView still relies on ActionPack in some of the tests. | |||||
| | * | | | Remove unneeded files | Piotr Sarnacki | 2013-06-20 | 7 | -88/+0 | |
| | | | | | ||||||
| | * | | | Move template tests from actionpack to actionview | Piotr Sarnacki | 2013-06-20 | 351 | -15/+1514 | |
| | | | | | ||||||
| | * | | | ActionView version should be 4.1.0 | Piotr Sarnacki | 2013-06-20 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | Move actionpack/lib/action_view* into actionview/lib | Piotr Sarnacki | 2013-06-20 | 97 | -95/+71 | |
| | | | | | ||||||
| | * | | | Add bare actionview gem to the root directory | Piotr Sarnacki | 2013-06-20 | 9 | -2/+147 | |
| |/ / / | | | | | | | | | | | | | This commit creates structure for Action View gem and is first of a series of commits extracting Action View from Action Pack. | |||||
| * | | | 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 | |||||
| | * | | | 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 3 typos in Configuration guide | |||||
| | * | | | 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 | |||||
| | * | | Fix name of nested attributes option include_id | Eric Hankins | 2013-06-19 | 1 | -2/+2 | |
| |/ / | | | | | The option to disable including a hidden ID field on a `fields_for` nested association was incorrectly documented as `hidden_field_id` instead of `include_id` | |||||
| * | | 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 | |||||
| | * | | Handle single quotes in PostgreSQL default column values | Dylan Markow | 2013-06-19 | 2 | -1/+26 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PostgreSQL escapes single quotes by using an additional single quote. When Rails queries the column information, PostgreSQL returns the default values with the escaped single quotes. #extract_value_from_default now converts these to one single quote each. Fixes #10881. | |||||
| * | | | Fixes AciveModel::Model with no ancestors, fixes #11004 | Fred Wu | 2013-06-19 | 2 | -3/+24 | |
| | | | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@plataformatec.com.br> | |||||
| * | | | Revert "Merge pull request #10566 from neerajdotname/10509d" | Jon Leighton | 2013-06-19 | 3 | -25/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 2b817a5e89ac0e7aeb894a40ae7151a0cf3cef16, reversing changes made to 353a398bee68c5ea99d76ac7601de0a5fef6f4a5. Conflicts: activerecord/CHANGELOG.md Reason: the build broke | |||||
| * | | | 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 | |||||
| | * | | | log the sql that is actually sent to the database | Neeraj Singh | 2013-06-19 | 3 | -1/+19 | |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If I have a query that produces sql `WHERE "users"."name" = 'a b'` then in the log all the whitespace is being squeezed. So the sql that is printed in the log is `WHERE "users"."name" = 'a b'`. This can be confusing. This commit fixes it by ensuring that whitespace is not squeezed. fixes #10982 | |||||
| * | | | 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] | |||||
| | * | | | 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 | |||||
| | * | | | 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 | |||||
| | * | | | do not load all child records for inverse case | Neeraj Singh | 2013-06-19 | 3 | -1/+25 | |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | currently `post.comments.find(Comment.first.id)` would load all comments for the given post to set the inverse association. This has a huge performance penalty. Because if post has 100k records and all these 100k records would be loaded in memory even though the comment id was supplied. Fix is to use in-memory records only if loaded? is true. Otherwise load the records using full sql. Fixes #10509 | |||||
| * | | | Merge pull request #10998 from Empact/tidy-changelog | Steve Klabnik | 2013-06-18 | 1 | -24/+26 | |
| |\ \ \ | | | | | | | | | Fix some activerecord changelog code to be displayed properly as code [ci skip] | |||||
| | * | | | Fix formatting of my name in the changelog, and given Aaron credit for ↵ | Ben Woosley | 2013-06-18 | 1 | -1/+3 | |
| | | | | | | | | | | | | | | | | | b483a0d2a75b | |||||
| | * | | | It takes 4 spaces or some backticks to have this code displayed as code in ↵ | Ben Woosley | 2013-06-18 | 1 | -23/+23 | |
| |/ / / | | | | | | | | | | the changelog. | |||||
| * | | | Merge pull request #10988 from tute/master | Yves Senn | 2013-06-18 | 1 | -2/+6 | |
| |\ \ \ | | | | | | | | | Add respond_with location option to docs Edit | |||||
| | * | | | 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. | |||||
| | * | | | `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 a deprecation warning. | |||||
| | * | | | | Removing a repetitive comment and removing a deprecation warning. | wangjohn | 2013-06-17 | 1 | -24/+7 | |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | The comment on the +env_config+ method is repetitive, likely to get outdated, and provides no useful information which cannot be gleamed from the code. I'm therefore removing it. I'm also refactoring the check for the presence of a secret_token in the configuration. | |||||
| * | | | | Revert "Merge pull request #10961 from wangjohn/changing_rails_env_config" | Santiago Pastorino | 2013-06-17 | 1 | -7/+24 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7098d6c9ab28931acc9562a00037567609f9e529, reversing changes made to 9ec2e2ee91568af24e09760a6de2890b89c33f56. This make some tests fail /cc @wangjohn | |||||
| * | | | | we only support 1.9+, so just check for a name | Aaron Patterson | 2013-06-17 | 1 | -1/+1 | |
| | | | | | ||||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |