Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix documentation of extract_handler_and_format_and_variant [ci skip] | Prathamesh Sonpatki | 2014-04-26 | 1 | -1/+1 |
| | |||||
* | move AR length validation tests into separate test-case. | Yves Senn | 2014-04-24 | 2 | -42/+48 |
| | | | | | Conflicts: activerecord/test/cases/validations/association_validation_test.rb | ||||
* | No need for trailing slash on migration path. | Jeremy Kemper | 2014-04-24 | 1 | -1/+1 |
| | | | | | | | Causes a double // in Dir.glob that breaks Ruby 2.2-trunk. Not really a bug, but not relevant to this test either. Originally added in ed21f0c50270139ddb6993acfdaea4586ffd09a3 | ||||
* | reset `@arel` when modifying a Relation in place. | Yves Senn | 2014-04-24 | 3 | -1/+18 |
| | | | | /cc @tenderlove | ||||
* | Merge pull request #14859 from jefflai2/datetime_type | Yves Senn | 2014-04-24 | 2 | -6/+15 |
|\ | | | | | PostgreSQL Timestamps always map to `:datetime`. | ||||
| * | PostgreSQL Timestamps always map to `:datetime`. | Jefferson Lai | 2014-04-24 | 2 | -6/+15 |
| | | | | | | | | | | | | | | The PG Adapter should use `:datetime` consistently instead of mapping mispellings to `:timestamp`. See #14513 | ||||
* | | Merge pull request #14856 from Gaurav2728/gaurav-typo_fix | Santiago Pastorino | 2014-04-24 | 1 | -2/+2 |
|\ \ | |/ |/| | [ci skip] Improve formatting and yml | ||||
| * | [ci skip] Improve formatting and yml | Gaurav Sharma | 2014-04-24 | 1 | -2/+2 |
|/ | |||||
* | Merge pull request #14858 from ebouchut/patch-1 | Robin Dupret | 2014-04-24 | 1 | -1/+1 |
|\ | | | | | Fix a typo in the doc of forty_two AR FinderMethod [ci skip] | ||||
| * | Fix a typo in the doc of forty_two AR FinderMethod | Eric Bouchut | 2014-04-24 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #14843 from ↵ | Santiago Pastorino | 2014-04-23 | 1 | -5/+5 |
|\ | | | | | | | | | tgxworld/improve_readability_of_contributing_to_rails_guide [ci skip] Improve readability of contributing to rails guide. | ||||
| * | Improve readability of contributing to rails guide. [ci skip] | Guo Xiang Tan | 2014-04-23 | 1 | -5/+5 |
| | | |||||
* | | Merge pull request #14852 from matthewd/fix_build_for_assets | Rafael Mendonça França | 2014-04-23 | 1 | -2/+2 |
|\ \ | | | | | | | Fix railties asset tests: precompile the image we're referencing | ||||
| * | | Precompile the image we're referencing, too. | Matthew Draper | 2014-04-24 | 1 | -2/+2 |
|/ / | | | | | | | | | | | | | | | | | | | You can't compile a file that references a non-compiled asset's path. .. unless you turn off asset runtime errors. Outside of a test case like this, `config.assets.precompile` would normally retain its default entry, which precompiles all images (and other non-JS/CSS files) that are in `app/assets`. | ||||
* | | Merge pull request #14842 from lucasmazza/lm-no-touching-callbacks | Yves Senn | 2014-04-23 | 3 | -2/+27 |
|\ \ | | | | | | | Move `NoTouching` down the inheritance chain on AR::Base | ||||
| * | | `ActiveRecord::Base.no_touching` no longer triggers callbacks or start empty ↵ | Lucas Mazza | 2014-04-23 | 3 | -2/+27 |
| |/ | | | | | | | | | | | transactions. Closes #14841. | ||||
* | | Merge pull request #14850 from chancancode/fix_json_cookie_jar | Guillermo Iguaran | 2014-04-23 | 3 | -2/+132 |
|\ \ | | | | | | | Fixed an issue with migrating legacy json cookies. | ||||
| * | | Fixed an issue with migrating legacy json cookies. | Godfrey Chan | 2014-04-23 | 3 | -2/+132 |
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the `VerifyAndUpgradeLegacySignedMessage` assumes all incoming cookies are marshal-encoded. This is not the case when `secret_token` is used in conjunction with the `:json` or `:hybrid` serializer. In those case, when upgrading to use `secret_key_base`, this would cause a `TypeError: incompatible marshal file format` and a 500 error for the user. Fixes #14774. *Godfrey Chan* | ||||
* | | Merge pull request #14840 from akshay-vishnoi/doc_changes | Arthur Nogueira Neves | 2014-04-23 | 1 | -2/+2 |
|\ \ | |/ |/| | Correct comment [ci skip] | ||||
| * | Correct comment [ci skip] | Akshay Vishnoi | 2014-04-23 | 1 | -2/+2 |
| | | |||||
* | | Perfer to define methods instead of calling test | Rafael Mendonça França | 2014-04-22 | 1 | -4/+4 |
| | | | | | | | | This file is using this pattern already | ||||
* | | Fix syntax error | Rafael Mendonça França | 2014-04-22 | 1 | -0/+1 |
| | | |||||
* | | Add CHANGELOG entry for #14757 [ci skip] | Rafael Mendonça França | 2014-04-22 | 1 | -0/+6 |
| | | |||||
* | | Merge pull request #14757 from estsauver/14752 | Rafael Mendonça França | 2014-04-22 | 5 | -6/+19 |
|\ \ | | | | | | | Fix behavior of select! to be consistent with select #14752 | ||||
| * | | select! renamed to avoid name collision Array#select! | Earl J St Sauver | 2014-04-21 | 5 | -6/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes #14752 Select mimics the block interface of arrays, but does not mock the block interface for select!. This change moves the api to be a private method, _select!. | ||||
* | | | Merge pull request #14573 from habermann24/has_many_through_fix | Rafael Mendonça França | 2014-04-22 | 5 | -2/+30 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Properly handle scoping with has_many :through. Fixes #14537. Conflicts: activerecord/CHANGELOG.md activerecord/test/cases/associations/has_many_through_associations_test.rb | ||||
| * | | | Minor improvement: Use the merge method on the relation instead of ↵ | Jan Habermann | 2014-04-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | instance_eval directly. | ||||
| * | | | Simplify the code in target_scope | Jan Habermann | 2014-04-03 | 1 | -5/+2 |
| | | | | |||||
| * | | | Add a CHANGELOG entry for the has_many :through scoping fix (See #14537 for ↵ | Jan Habermann | 2014-04-03 | 1 | -0/+9 |
| | | | | | | | | | | | | | | | | details). | ||||
| * | | | Properly handle scoping with has_many :through. Fixes #14537. | Jan Habermann | 2014-04-03 | 4 | -2/+25 |
| | | | | |||||
* | | | | Merge pull request #14801 from kuldeepaggarwal/fix-string-inflection | Rafael Mendonça França | 2014-04-22 | 2 | -1/+6 |
|\ \ \ \ | | | | | | | | | | | Fix inconsistent behavior from String#pluralize | ||||
| * | | | | Fix inconsistent behavior from String#pluralize | Kuldeep Aggarwal | 2014-04-19 | 2 | -1/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before: When calling String#pluralize with count=1 then it returned same string, but with count other than 1, returned new string. After: String#pluralize always return a new string. => Prevent mutation of a string inadvertently. | ||||
* | | | | | Merge pull request #14836 from jonatack/patch-5 | Yves Senn | 2014-04-22 | 1 | -8/+8 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix run-on sentences and improve grammar [skip ci] | ||||
| * | | | | | Fix run-on sentences and improve grammar [skip ci] | Jon Atack | 2014-04-22 | 1 | -8/+8 |
|/ / / / / | |||||
* | | | | | Merge pull request #13335 from glorieux/favicon_link_tag_mimetype | Rafael Mendonça França | 2014-04-22 | 3 | -6/+21 |
|\ \ \ \ \ | | | | | | | | | | | | | Change favicon_link_tag helper mimetype from image/vnd.microsoft.icon to image/x-icon. | ||||
| * | | | | | Change favicon_link_tag helper mimetype from image/vnd.microsoft.icon to ↵ | glorieux | 2014-04-21 | 3 | -6/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | image/x-icon. Although the official IANA-registered MIME type for ICO files is image/vnd.microsoft.icon, registered in 2003, it was submitted to IANA by a third party and is not recognized by Microsoft products. The MIME type image/x-icon should be used since is the one recognized by the major browsers on the market. | ||||
* | | | | | | Merge pull request #10764 from mokevnin/replace_class_eval_by_define_method | Rafael Mendonça França | 2014-04-22 | 1 | -35/+29 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | replace class_eval by define_method in abstract_controller/callbacks | ||||
| * | | | | | | replace class_eval by define_method in abstract_controller/callbacks | kirill | 2014-04-20 | 1 | -35/+29 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #14835 from zzak/test_form_helper_label_with_block_and_html | Rafael Mendonça França | 2014-04-22 | 2 | -0/+8 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Add test for using ActionView::Helpers::FormHelper.label with block and html | ||||
| * | | | | | | | Add test for using ActionView::Helpers::FormHelper.label with block and html | Zachary Scott | 2014-04-22 | 2 | -0/+8 |
|/ / / / / / / | |||||
* | / / / / / | Rearrange deck chairs on the titanic. Organize connection handling test cases. | Jeremy Kemper | 2014-04-21 | 4 | -249/+246 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | Merge pull request #14826 from stevegraham/action_controller_renderer_doc_fix | Arthur Nogueira Neves | 2014-04-20 | 1 | -2/+2 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | ActionController::Renderers documentation fix | ||||
| * | | | | | | ActionController::Renderers documentation fix | Stevie Graham | 2014-04-20 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActionController::Renderers::RENDERERS is an instance of Set. Docs incorrectly state that it's a Hash. | ||||
* | | | | | | | Merge pull request #14825 from arunagw/aa-remove-missleading-comment | Arun Agrawal | 2014-04-20 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Removed missleading comment [ci skip] | ||||
| * | | | | | | Changed miss-leading comment [ci skip] | Arun Agrawal | 2014-04-20 | 1 | -1/+1 |
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After this 21dbe6f39b57f52967e92716dbd5e2b894e7a64c 2.1.1 :001 > 'business'.classify => "Business" 2.1.1 :004 > 'calculus'.classify => "Calculu" 2.1.1 :005 > | ||||
* | | | | | | Merge pull request #14823 from kuldeepaggarwal/fix-inflector-example | Arun Agrawal | 2014-04-20 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | correct the classify example's output. | ||||
| * | | | | | [ci-skip] correct the classify example's output | Kuldeep Aggarwal | 2014-04-21 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #14820 from akshay-vishnoi/doc_changes | Richard Schneeman | 2014-04-20 | 6 | -8/+8 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | [ci skip] builtin -> built-in | ||||
| * | | | | [ci skip] builtin -> built-in | Akshay Vishnoi | 2014-04-20 | 6 | -8/+8 |
| | | | | | |||||
* | | | | | Merge pull request #14821 from jonatack/patch-5 | Arthur Nogueira Neves | 2014-04-20 | 1 | -47/+63 |
|\ \ \ \ \ | |/ / / / |/| | | | | Fix code indentation and improve formatting |