aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #19587 from rails/rm-sprockets-3Rafael Mendonça França2015-03-295-17/+16
|\ | | | | Test using sprockets 3
| * Test using sprockets 3Rafael Mendonça França2015-03-295-17/+16
|/
* Merge pull request #19581 from kirs/bin-deprecation-versionRafael Mendonça França2015-03-291-1/+2
|\ | | | | Replace `in Rails 4` with `in Rails %version%` in deprecation message
| * Replace `in Rails 4` with `in Rails %version%` in deprecation messageKir Shatrov2015-03-291-1/+2
| |
* | Merge pull request #19585 from sgrif/sg-deprecate-tokenizerRafael Mendonça França2015-03-293-12/+51
|\ \ | | | | | | Deprecate the `:tokenizer` option to `validates_length_of`
| * | Deprecate the `:tokenizer` option to `validates_length_of`Sean Griffin2015-03-293-12/+51
|/ / | | | | | | | | | | | | | | As demonstrated by #19570, this option is severely limited, and satisfies an extremely specific use case. Realistically, there's not much reason for this option to exist. Its functionality can be trivially replicated with a normal Ruby method. Let's deprecate this option, in favor of the simpler solution.
* / Clarify the role of `ActiveRecord::Core.encode_with`Sean Griffin2015-03-291-4/+8
|/ | | | Fixes #19568
* Reduce memory usage when loading types in PGSean Griffin2015-03-294-10/+40
| | | | | | | | | | | | | We were never clearing the `PG::Result` object used to query the types when the connection is first established. This would lead to a potentially large amount of memory being retained for the life of the connection. Investigating this issue also revealed several low hanging fruit on the performance of these methods, and the number of allocations has been reduced by ~90%. Fixes #19578
* Merge pull request #19483 from yui-knk/fix/getting_startedZachary Scott2015-03-291-1/+1
|\ | | | | [ci skip] Fix an object of `reference`
| * [ci skip] Fix an object of `reference`yui-knk2015-03-241-1/+1
| |
* | Merge pull request #19575 from y-yagi/fix_batches_testZachary Scott2015-03-291-2/+3
|\ \ | | | | | | use correct method in batches test
| * | use correct method in batches testyuuji.yaginuma2015-03-291-2/+3
|/ /
* | Merge pull request #19544 from shuhei/fix-parameters-const-missingXavier Noria2015-03-282-2/+9
|\ \ | | | | | | Return super in ActionController::Parameters.const_missing
| * | Return super in ActionController::Parameters.const_missingShuhei Kagawa2015-03-282-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current implementation of ActionController::Parameters.const_missing returns `ActionController::Parameters.always_permitted_parameters` even if its `super` returns a constant without raising error. This prevents its subclass in a autoloading module/class from taking advantage of autoloading constants. class SomeParameters < ActionController::Parameters def do_something DefinedSomewhere.do_something end end In the code above, `DefinedSomewhere` is to be autoloaded with `Module.const_missing` but `ActionController::Parameters.const_missing` returns `always_permitted_parameters` instead of the autoloaded constant. This pull request fixes the issue respecting `const_missing`'s `super`.
* | | Remove circular requireRafael Mendonça França2015-03-272-4/+0
| | |
* | | Merge pull request #19562 from mechanicles/remove-old-linkRafael Mendonça França2015-03-271-1/+1
|\ \ \ | | | | | | | | Remove old and not working link. [ci skip]
| * | | Remove old and not working link. [ci skip]Santosh Wadghule2015-03-281-1/+1
| | | |
* | | | Define a setup method instead of using setup as blockRafael Mendonça França2015-03-271-1/+2
| | | | | | | | | | | | | | | | | | | | setup as block run before setup actlually runs so it will fail for our case
* | | | Remove Array#inquiryRafael Mendonça França2015-03-274-27/+1
| | | | | | | | | | | | | | | | | | | | We are promoting too much a feature that will not be widler used. So for now lets keep just the ArrayInquirer constructor.
* | | | Merge pull request #18939 from georgeclaghorn/variant-inquiryRafael Mendonça França2015-03-2710-33/+171
|\ \ \ \ | |/ / / |/| | | | | | | Provide friendlier access to request variants
| * | | Add ActiveSupport::ArrayInquirer and Array#inquiryGeorge Claghorn2015-03-247-27/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wrapping an array in an `ArrayInquirer` gives a friendlier way to check its string-like contents. For example, `request.variant` returns an `ArrayInquirer` object. To check a request's variants, you can call: request.variant.phone? request.variant.any?(:phone, :tablet) ...instead of: request.variant.include?(:phone) request.variant.any? { |v| v.in?([:phone, :tablet]) } `Array#inquiry` is a shortcut for wrapping the receiving array in an `ArrayInquirer`: pets = [:cat, :dog] pets.cat? # => true pets.ferret? # => false pets.any?(:cat, :ferret} # => true
| * | | Provide friendlier access to request variantsGeorge Claghorn2015-03-244-37/+90
| | | | | | | | | | | | | | | | Closes #18933.
* | | | Merge pull request #19554 from prathamesh-sonpatki/improve-changelogZachary Scott2015-03-271-1/+1
|\ \ \ \ | | | | | | | | | | Improve CHANGELOG for fix for respecting pluralize_table_names [ci skip...
| * | | | Improve CHANGELOG for fix for respecting pluralize_table_names [ci skip]Prathamesh Sonpatki2015-03-271-1/+1
|/ / / /
* | | | Merge pull request #19547 from jonatack/warn-on-loading-large-query-setsAbdelkader Boudih2015-03-272-7/+6
|\ \ \ \ | | | | | | | | | | [skip ci] Improve `warn_on_records_fetched` code documentation
| * | | | [skip ci] Improve `warn_on_records_fetched` documentationJon Atack2015-03-272-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - ‘dection’ -> ‘detection’ - ‘exceeds threshold’ -> ‘exceeds the threshold’ - Other minor improvements.
* | | | | Merge pull request #19540 from y-yagi/fix_fixture_file_nameYves Senn2015-03-274-1/+21
|\ \ \ \ \ | | | | | | | | | | | | respect `pluralize_table_names` when generate fixture file. fixes #19519
| * | | | | respect `pluralize_table_names` when generate fixture file. fixes #19519yuuji.yaginuma2015-03-274-1/+21
| | | | | |
* | | | | | Merge pull request #19535 from JuanitoFatas/doc/av-commentYves Senn2015-03-271-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | [ci skip] Unify the code comment in ActionView::Renderer#render_template...
| * | | | | | [ci skip] Unify the code comment in ActionView::Renderer#render_template.Juanito Fatas2015-03-271-1/+1
| | | | | | |
* | | | | | | Merge pull request #19543 from mechanicles/fix-docMatthew Draper2015-03-271-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Correct doc sentence [ci skip]
| * | | | | | | Correct doc sentence [ci skip]Santosh Wadghule2015-03-271-1/+1
| | |_|_|_|/ / | |/| | | | |
* / | | | | | Missing require 'active_support/deprecation'Akira Matsuda2015-03-273-0/+5
|/ / / / / /
* | | | | | Merge pull request #19541 from jonatack/warn-on-loading-large-query-setsRichard Schneeman2015-03-271-0/+5
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | [skip ci] Update configuring.md with #18846
| * | | | | [skip ci] Update configuring.md with #18846Jon Atack2015-03-271-0/+5
|/ / / / / | | | | | | | | | | | | | | | | | | | | Add `config.active_record.warn_on_records_fetched_greater_than` to the Configuring Rails Guide.
* | | | | Partially merge #17650Sean Griffin2015-03-263-147/+20
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merges 647eb2cf1cd65b0391e3584361f0fc76246e64f3. The pull request as a whole is quite large, and I'm reviewing the smaller pieces individually.
| * | | | | PostgreSQL, Use ruby-pg's built-in capabilities for array en-/decoding in C.Lars Kanis2015-03-253-147/+10
| | | | | | | | | | | | | | | | | | | | | | | | This obsoletes the ruby based implementations.
| * | | | | PostgreSQL, Add input type casts for primitive types.Lars Kanis2015-03-251-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ruby-pg's default way to serialize values for transmission to the database is to call #to_s . This however creates a temporary String object for each value. Setting a class based type map avoids the allocation of this additional String. The performance benefit is measurable in microbenchmarks, but not with the overhead of activerecord. However it's free to use and has no drawback.
* | | | | | 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