aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | Partially merge #17650Sean Griffin2015-03-268-24/+24
|\| | | | | | | | | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Merges 1d8d5a74b81b8aab1f5e6d233d509a92525ed4e1. The pull request as a whole is quite large, and I'm reviewing the smaller pieces individually.
| * | | | | | | PostgreSQL, Fix OID based type casts in C for primitive types.Lars Kanis2015-03-258-24/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The type map was introduced in aafee23, but wasn't properly filled. This mainly adjusts many locations, that expected strings instead of integers or boolean. add_pg_decoders is moved after setup of the StatementPool, because execute_and_clear could potentially make use of it.
* | | | | | | | Merge pull request #18846 from hundredwatt/feat/warn-on-result-set-sizeRafael Mendonça França2015-03-265-0/+102
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add `config.active_record.warn_on_result_set_size` option
| * | | | | | | | Add `config.active_record.warn_on_records_fetched_greater_than` optionJason Nochlin2015-03-255-0/+102
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When set to an integer, a warning will be logged whenever a result set larger than the specified size is returned by a query. Fixes #16463 The warning is outputed a module which is prepended in an initializer, so there will be no performance impact if `config.active_record.warn_on_records_fetched_greater_than` is not set.
* | | | | | | | Merge pull request #19536 from JuanitoFatas/doc/av-determine_templateRafael Mendonça França2015-03-261-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Add missing :html option in determine_template error message.
| * | | | | | | Add missing :html option in determine_template error message.Juanito Fatas2015-03-271-1/+1
|/ / / / / / /
* | | | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2015-03-2612-40/+41
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: guides/source/4_0_release_notes.md
| * | | | | | | [ci skip] Fix `&>` with `%>`yui-knk2015-03-251-9/+9
| | | | | | | |
| * | | | | | | Rails 5 requires 2.2.1. [ci skip]Juanito Fatas2015-03-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow up of https://github.com/rails/rails/pull/19263.
| * | | | | | | [ci skip] Change to a singular form (`the comment model`)yui-knk2015-03-241-1/+1
| | | | | | | |
| * | | | | | | [ci skip] Capitalize titleyui-knk2015-03-221-1/+1
| | | | | | | |
| * | | | | | | Better title in Testing GuideKir Shatrov2015-03-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | suggested by @senny https://github.com/rails/rails/pull/18305#issuecomment-73847595
| * | | | | | | [ci skip] Add a line between code example and docsyui-knk2015-03-211-0/+1
| | | | | | | |
| * | | | | | | [ci skip] Add <tt> tag to `save!` and `create!`yui-knk2015-03-211-1/+1
| | | | | | | |
| * | | | | | | [ci skip] Fix link formatyui-knk2015-03-151-1/+1
| | | | | | | |
| * | | | | | | [ci skip] Remove spacesyui-knk2015-03-141-27/+27
| | | | | | | |
| * | | | | | | [ci skip] Add space after erb block.yui-knk2015-03-121-1/+1
| | | | | | | |
| * | | | | | | [ci skip] Add space after erb block.yui-knk2015-03-121-1/+1
| | | | | | | |
| * | | | | | | Add backquote to :as option.yui-knk2015-03-111-1/+1
| | | | | | | |
| * | | | | | | [ci skip] Remove unnecessary spaceyui-knk2015-03-041-2/+2
| | | | | | | |
| * | | | | | | [ci skip] Fix fenced code block langyui-knk2015-03-031-1/+1
| | | | | | | |
| * | | | | | | [ci skip] Add `.`yui-knk2015-03-031-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #19521 from mudphone/test_fixture_docsArthur Nogueira Neves2015-03-251-2/+2
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | [skip ci] Minor edits for clarity in the test fixture guide.
| * | | | | | | [skip ci] Minor edits for clarity, to make smooth, & separate clauses.Kyle Oba2015-03-251-2/+2
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add conjunction for clarity. * Add comma between independent clauses: create command, and generation of fixtures.
* | | | | | | Merge pull request #19496 from andreynering/docs-migrations-changeKasper Timm Hansen2015-03-251-0/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Documenting remove_column as a reversible migration method
| * | | | | | | Documenting remove_column as a reversible migration method [ci skip]Andrey Nering2015-03-251-0/+8
|/ / / / / / /
* | | | | | | Merge pull request #19503 from jasoncodes/no-psqlrcYves Senn2015-03-253-3/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Avoid loading user's psqlrc when loading test structure
| * | | | | | | Avoid loading user's psqlrc when loading test structureJason Weathered2015-03-251-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #19507 from jonatack/ar-validations-guide-fixesKasper Timm Hansen2015-03-251-3/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [skip ci] Active Record Validations guide fixes
| * | | | | | | | [ci skip] Active Record Validations guide fixesJon Atack2015-03-251-3/+5
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove deprecated `[]=` - Fix duplicate `errors#add` example. The second code example was originally `[]=`, replace it with `[] <<`. - Improve explanations for `errors#add` and `errors#full_messages` Follow-up to PR #19457 (closed after borking my git history). Apologies for the duplicate PR. cc @kaspth
* | | | | | | | Merge pull request #19504 from y-yagi/fix_digest_explainClaudio B.2015-03-241-2/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | update `config.assets.digest` default value in guides [ci skip]
| * | | | | | | update `config.assets.digest` default value in guides [ci skip]yuuji.yaginuma2015-03-251-2/+1
|/ / / / / / /
* | | | | | | Merge pull request #19502 from kaspth/assert-select-failure-outputRafael Mendonça França2015-03-241-0/+24
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [ci skip] Update 4.2 Release notes with more assert_select information.
| * | | | | | | [ci skip] Update 4.2 Release notes with more assert_select information.Kasper Timm Hansen2015-03-241-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds documentation for substitutions and why Regexp substitions look different when assertion fails.
* | | | | | | | Merge pull request #19499 from swalkinshaw/patch-1Arthur Nogueira Neves2015-03-241-7/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Update ActiveSupport::Subscriber docs
| * | | | | | | Update ActiveSupport::Subscriber docsScott Walkinshaw2015-03-241-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | For consistency purposes with the changes done in https://github.com/rails/rails/pull/12285
* | | | | | | | Add changelog entry for #19271Arthur Neves2015-03-241-0/+7
| |_|/ / / / / |/| | | | | |
* | | | | | | Revert "Merge pull request #19500 from ccutrer/dry_sti_subclass_finding"Rafael Mendonça França2015-03-241-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5cfa6a8ab997089c3012a82052c8c317b2e095f5, reversing changes made to bfd5bf8313e6ea0bb2eccb68ee5076bb63f0b2db. Reason: This broken travis build.
* | | | | | | Merge pull request #19500 from ccutrer/dry_sti_subclass_findingRafael Mendonça França2015-03-241-19/+19
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | DRY up STI subclass logic
| * | | | | | DRY up STI subclass logicCody Cutrer2015-03-241-19/+19
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the newer method used for discriminating new records did not use the older and more robust method used for instantiating existing records, but did have a better post-check to ensure the sublass was in the hierarchy. so move the descendants check to find_sti_class, and then simply call find_sti_class from subclass_from_attributes
* | | | | | Merge pull request #19452 from ↵Carlos Antonio da Silva2015-03-243-1/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pinglamb/fix-referencing-wrong-alias-when-joining-tables-of-has-many-through-association Fix referencing wrong aliases while joining tables of has many through association
| * | | | | | Fix referencing wrong aliases while joining tables of has many throughpinglamb2015-03-223-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | association While joining table of has_many :through association, ActiveRecord will use the actual table name instead of through-join alias. It results with a wrong SQL and exception is raised. This only happens when calculation methods like #count is called. This issue is affecting Rails 4.1.x and 4.2.x as well.
* | | | | | | Merge pull request #19493 from larskanis/add_infinity_testYves Senn2015-03-241-0/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | PostgreSQL, Add test case for "Infinity" string assignment to float columns
| * | | | | | | PostgreSQL, Add test case for "Infinity" string assignment to float columns.Lars Kanis2015-03-221-0/+9
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | This is implemented in Type::Float, but not tested, so far.
* | | | | | | Merge pull request #19488 from yui-knk/fix/comment2Yves Senn2015-03-241-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [ci skip] Remove unacceptable method name
| * | | | | | | [ci skip] Remove unacceptable method nameyui-knk2015-03-241-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #19491 from tgxworld/fix_incorrect_descriptionYves Senn2015-03-241-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Fix incorrect description for `assert_nothing_raised`. [ci skip]
| * | | | | | | Fix incorrect description for `assert_nothing_raised`.Guo Xiang Tan2015-03-241-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #19485 from tgxworld/small_doc_fixRafael Mendonça França2015-03-241-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Small doc fix. [CI SKIP]
| * | | | | | | Small doc fix. [CI SKIP]Guo Xiang Tan2015-03-241-1/+1
| | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-07 22:46:59 +0000