aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #11017 from stormsilver/patch-1Yves Senn2013-06-191-2/+2
|\ | | | | Fix name of nested attributes option include_id
| * Fix name of nested attributes option include_idEric Hankins2013-06-191-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 Senn2013-06-191-0/+5
|
* Merge pull request #10884 from dmarkow/pg_fix_default_quotesYves Senn2013-06-192-1/+26
|\ | | | | Handle single quotes in PostgreSQL default column values
| * Handle single quotes in PostgreSQL default column valuesDylan Markow2013-06-192-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 #11004Fred Wu2013-06-192-3/+24
| | | | | | | | Signed-off-by: José Valim <jose.valim@plataformatec.com.br>
* | Revert "Merge pull request #10566 from neerajdotname/10509d"Jon Leighton2013-06-193-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 Senn2013-06-191-2/+17
| |
* | Merge pull request #10991 from neerajdotname/10982Yves Senn2013-06-193-1/+19
|\ \ | | | | | | log the sql that is actually sent to the database
| * | log the sql that is actually sent to the databaseNeeraj Singh2013-06-193-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 Senn2013-06-191-3/+6
| |
* | Merge pull request #11007 from ugisozols/remove_duplicate_letterYves Senn2013-06-191-1/+1
|\ \ | | | | | | Remove duplicate letter 'a'. [ci skip]
| * | Remove duplicate letter 'a'. [ci skip]Uģis Ozols2013-06-191-1/+1
|/ /
* | Merge pull request #11002 from fredwu/master-activemodel-inclusion-chain-fixJosé Valim2013-06-182-0/+14
|\ \ | | | | | | Fixed ActiveModel::Model's inclusion chain
| * | Fixed ActiveModel::Model's inclusion chainFred Wu2013-06-192-0/+14
|/ /
* | Merge pull request #10566 from neerajdotname/10509dJon Leighton2013-06-183-1/+25
|\ \ | | | | | | do not load all child records for inverse case
| * | do not load all child records for inverse caseNeeraj Singh2013-06-193-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-changelogSteve Klabnik2013-06-181-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 Woosley2013-06-181-1/+3
| | | | | | | | | | | | b483a0d2a75b
| * | It takes 4 spaces or some backticks to have this code displayed as code in ↵Ben Woosley2013-06-181-23/+23
|/ / | | | | | | the changelog.
* | Merge pull request #10988 from tute/masterYves Senn2013-06-181-2/+6
|\ \ | | | | | | Add respond_with location option to docs Edit
| * | Add `respond_with` `location` option to the docsTute Costa2013-06-181-2/+6
|/ /
* | Merge pull request #10987 from senny/10979_association_include_returns_trueXavier Noria2013-06-182-12/+12
|\ \ | | | | | | `CollectionProxy#include?` returns `true` and `false` as documented.
| * | `CollectionProxy#include?` returns `true` and `false` as documented.Yves Senn2013-06-182-12/+12
| | |
* | | Merge pull request #10986 from wangjohn/changing_rails_env_configJosé Valim2013-06-171-24/+7
|\ \ \ | | | | | | | | Removing a repetitive comment and a deprecation warning.
| * | | Removing a repetitive comment and removing a deprecation warning.wangjohn2013-06-171-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 Pastorino2013-06-171-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 nameAaron Patterson2013-06-171-1/+1
| | |
* | | be consistent about parameter types passed to new_constants_inAaron Patterson2013-06-171-1/+1
| | |
* | | Merge pull request #10968 from wangjohn/refactoring_rails_application_classSantiago Pastorino2013-06-172-95/+109
|\ \ \ | | | | | | | | Creating a class to build the default middleware stack.
| * | | Creating a class to build the default middleware stack.wangjohn2013-06-162-95/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | A lot of logic for building the default middleware stack is currently kept in Application class, but this can be encapsulated and made more modular by being moved to its own class. Also refactored a couple of the helper methods.
* | | | load the file rather than evalingAaron Patterson2013-06-171-1/+1
| | | |
* | | | Merge pull request #10961 from wangjohn/changing_rails_env_configSantiago Pastorino2013-06-171-24/+7
|\ \ \ \ | | | | | | | | | | Removing a repetitive comment and refactoring the Application class in Railties
| * | | | Removing a repetitive comment and refactoring the Application class inwangjohn2013-06-161-24/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Railties. 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.
* | | | | Merge pull request #10902 from wangjohn/removing_application_singleton_callsSantiago Pastorino2013-06-1712-23/+23
|\ \ \ \ \ | | | | | | | | | | | | Calls to the application constant have been refactored
| * | | | | Calls to the application constant have been refactored to usewangjohn2013-06-1012-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails.application when drawing routes and creating other configurations on the application.
* | | | | | just construct real objects rather than mock and stubAaron Patterson2013-06-171-7/+8
| | | | | |
* | | | | | Merge branch 'master' into mrbrdo-fixserializationAaron Patterson2013-06-17153-573/+1159
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (142 commits) Use Colspan in th Tags Added test for link_to_unless to make sure the result consistency. Escape the string even when the condition of link_to_unless is not satisfied. Add CHANGELOG entry for #10969 Use a case insensitive URI Regexp for #asset_path collection tags accept html attributes as the last element of collection Rewind StringIO instances before be parsed again Use xml instead already parsed xml Updated the doc for const_regexp [ci skip] Make test name descriptive and add reference to original regression commit fixture setup does not rely on `AR::Base.configurations`. regression test + mysql2 adapter raises correct error if conn is closed. cleanup, remove trailing whitespace from AR changelog 'json' gem is no more required under JRuby fix typos Fix AS changelog [ci skip] Update the HTML boolean attributes per the HTML 5.1 spec Changing const_regexp to check for constant name. valid_app_const? -> valid_const? Add CHANGELOG entry for #10740 ...
| * \ \ \ \ \ Merge pull request #10970 from sbagdat/patch-1Rafael Mendonça França2013-06-174-9/+10
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Use Colspan in th Tags
| | * | | | | | Use Colspan in th TagsSıtkı Bağdat2013-06-174-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Is it more suitable that using ```<th colspan="3">``` instead of three empty ```<th>```? It is simple, but what i am missing about it? Change repetitive th tags to use colspan attribute Update CHANGELOG.md Update CHANGELOG.md
| * | | | | | | Merge pull request #10971 from dtaniwaki/escape_link_to_unlessRafael Mendonça França2013-06-172-1/+6
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | Always escape the result of link_to_unless method
| | * | | | | | Added test for link_to_unless to make sure the result consistency.dtaniwaki2013-06-161-0/+5
| | | | | | | |
| | * | | | | | Escape the string even when the condition of link_to_unless is not satisfied.dtaniwaki2013-06-161-1/+1
| | | | | | | |
| * | | | | | | Merge pull request #10942 from yangchenyun/mineYves Senn2013-06-161-2/+2
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | correct documentation about active_record.default_timezone
| | * | | | | | correct documentation about active_record behaviorSteven Yang2013-06-151-2/+2
| | | | | | | |
| * | | | | | | Add CHANGELOG entry for #10969Rafael Mendonça França2013-06-161-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | Merge pull request #10969 from davidcelis/case-insensitive-asset-pathRafael Mendonça França2013-06-162-3/+6
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | Use a case insensitive URI Regexp for #asset_path
| | * | | | | | Use a case insensitive URI Regexp for #asset_pathDavid Celis2013-06-162-3/+6
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Context: https://gist.github.com/radar/5793814 The `URI_REGEXP` that various AssetUrl helpers use is currently case sensitive when checking for a URI scheme. This means if you try to pass a URL like `HTTP://www.example.com/path/to/image.jpg`, you end up with a bogus asset path: `/assets/HTTP://www.example.com/path/to/image.jpg`. URLs are case insensitive, so this regexp should be as well. Signed-off-by: David Celis <me@davidcel.is>
| * | | | | | Merge pull request #10964 from nashby/collection-html-optionsRafael Mendonça França2013-06-163-1/+23
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | collection tags accept html attributes as the last element of collection
| | * | | | | | collection tags accept html attributes as the last element of collectionVasiliy Ermolovich2013-06-163-1/+23
| |/ / / / / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 16:22:19 +0000