aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #19189 from ↵Richard Schneeman2015-03-041-2/+5
|\ | | | | | | | | mraidel/activesupport_cache_fetch_multi_documentation_fix fixes documentation for returned hash in cache.fetch_multi
| * fixes documentation for returned hash in cache.fetch_multiMichael Raidel2015-03-041-2/+5
| |
* | Fix spelling [ci skip]Yu Haidong2015-03-041-8/+8
| |
* | Take DST into account when locating TimeZone from Numeric.Yasyf Mohamedali2015-03-033-1/+24
|/ | | | | | When given a specific offset, use the first result found where the total current offset (including any periodic deviations such as DST) from UTC is equal.
* Merge pull request #19173 from robin850/rbx-buildRafael Mendonça França2015-03-023-1/+6
|\ | | | | Improve the Rubinius build
| * Skip the failing tests on Rubinius for nowRobin Dupret2015-03-022-0/+5
| |
| * Wrap inline rescue with or-equal callsRobin Dupret2015-03-021-1/+1
| | | | | | | | | | At the moment, `rescue_from` doesn't work with strings on Rubinius because of rubinius/rubinius#3272.
* | Move Array#without from Grouping to Access concern and add dedicated test ↵David Heinemeier Hansson2015-03-023-12/+16
| | | | | | | | (relates to #19157)
* | Remove not needed .tapArthur Neves2015-03-021-1/+1
| |
* | Do not output in the consoleRafael Mendonça França2015-03-021-1/+1
|/ | | | [Robin Dupret + Rafael Mendonça França]
* Use include? instead of in? for Enumerable#without.Juanito Fatas2015-03-022-2/+1
| | | | [egilburg]
* Include object inclusion for enumerable test.Juanito Fatas2015-03-021-0/+1
|
* Add Enumerable#withoutTodd Bealmear2015-03-014-0/+35
|
* Merge pull request #19131 from ↵Yves Senn2015-02-281-1/+1
|\ | | | | | | | | tgxworld/reduce_allocated_memory_in_module_delegate Reduce allocated memory for Module#delegate.
| * Reduce allocated memory for Module#delegate.Guo Xiang Tan2015-03-011-1/+1
| |
* | [ci skip] Add code examples for Module#anonymous? documentationAnton Davydov2015-02-281-0/+7
| |
* | [ci skip] Update documentation for Range#to_formatted_sAnton Davydov2015-02-281-2/+17
|/
* [skip ci] Add documentation for String#is_utf8? methodAnton Davydov2015-02-281-0/+7
|
* Merge pull request #19121 from davydovanton/update-doc-for-removeYves Senn2015-02-281-2/+3
|\ | | | | | | Update documentation examples for String#remove [skip ci]
| * Update documentation examples for String#remove [skip ci]Anton Davydov2015-02-281-6/+7
|/
* Merge pull request #19076 from nygrenh/truncate-words-fixRafael Mendonça França2015-02-253-1/+15
|\ | | | | | | Fix a backtracking problem in String#truncate_words
| * Fix a backtracking problem in String#truncate_wordsHenrik Nygren2015-02-253-1/+15
| | | | | | | | Fixes #19070.
* | Merge pull request #18948 from kaspth/automatic-collection-cachingRafael Mendonça França2015-02-253-20/+46
|\ \ | |/ |/| Merge multi_fetch_fragments.
| * Instrument read_multi.Kasper Timm Hansen2015-02-213-20/+46
| | | | | | | | | | | | | | | | | | | | Adds `read_multi` instrumentation formatted as: Caches multi read: - views/david/2/4184ab71db6849621a4d8820fcd2c0ad - views/david/2/4184ab71db6849621a4d8820fcd2c0ad - views/david/3/4184ab71db6849621a4d8820fcd2c0ad - views/david/3/4184ab71db6849621a4d8820fcd2c0ad
* | some indenting and punctuation fixes. [ci skip]Yves Senn2015-02-231-13/+14
| |
* | s/around_filter/around_action/Akira Matsuda2015-02-211-1/+1
|/
* Merge branch 'master' of github.com:rails/docrailsVijay Dev2015-02-141-2/+2
|\
| * Wording fixes for `:skip_after_callbacks_if_terminated` callbacks optionVipul A M2015-01-311-2/+2
| |
* | Merge pull request #18885 from ypxing/masterRafael Mendonça França2015-02-121-12/+7
|\ \ | | | | | | remove unnecessary assignment/parameter passing in AS::Callbacks...::Around (master branch)
| * | remove unnecessary assignment and parameter passing in ↵rxing2015-02-111-12/+7
| | | | | | | | | | | | ActiveSupport::Callbacks::Filters::Around
* | | Properly dump primitive-like AS::SafeBuffer strings as YAMLGodfrey Chan2015-02-113-1/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `coder.represent_scalar` means something along the lines of "Here is a quoted string, you can just add it to the output", which is not the case here. It only works for simple strings that can appear unquoted in YAML, but causes problems for e.g. primitive-like strings ("1", "true"). `coder.represent_object` on the other hand, means that "This is the Ruby-object representation for this thing suitable for use in YAML dumping", which is what we want here. Before: YAML.load ActiveSupport::SafeBuffer.new("Hello").to_yaml # => "Hello" YAML.load ActiveSupport::SafeBuffer.new("true").to_yaml # => true YAML.load ActiveSupport::SafeBuffer.new("false").to_yaml # => false YAML.load ActiveSupport::SafeBuffer.new("1").to_yaml # => 1 YAML.load ActiveSupport::SafeBuffer.new("1.1").to_yaml # => 1.1 After: YAML.load ActiveSupport::SafeBuffer.new("Hello").to_yaml # => "Hello" YAML.load ActiveSupport::SafeBuffer.new("true").to_yaml # => "true" YAML.load ActiveSupport::SafeBuffer.new("false").to_yaml # => "false" YAML.load ActiveSupport::SafeBuffer.new("1").to_yaml # => "1" YAML.load ActiveSupport::SafeBuffer.new("1.1").to_yaml # => "1.1" If we ever want Ruby to behave more like PHP or JavaScript though, this is an excellent trick to use ;)
* | | Merge pull request #18906 from awd/fix-test-descriptionRafael Mendonça França2015-02-111-1/+1
|\ \ \ | | | | | | | | Fixes incorrect wording of test description
| * | | Fixes wording of test descriptionAdam Doeler2015-02-111-1/+1
| | | |
* | | | Revert 88d08f2ec9f89ba431cba8d0c06ac9ebc204bbbbRafael Mendonça França2015-02-112-13/+25
|/ / / | | | | | | | | | | | | | | | | | | This caused a performance regression since we were decided to do the nil check in run time not in the load time. See https://github.com/rails/rails/pull/15187#issuecomment-71760058
* / / Reduce object allocations in ActiveSupport::Subscribereileencodes2015-02-111-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Freezing the string literal reduces the number of objects allocated during integration test runs. AllocationTracer before: ``` [["/rack/lib/rack/utils.rb", 499, :T_STRING], [50939, 2737, 78553, 0, 13, 1783920]] [["/rails/activesupport/lib/active_support/subscriber.rb", 99, :T_STRING], [44959, 0, 42633, 0, 2, 1670800]] [["/rack/lib/rack/utils.rb", 662, :T_STRING], [32979, 0, 31263, 0, 1, 1226009]] [["/rack/lib/rack/body_proxy.rb", 34, :T_ARRAY], [29988, 0, 28438, 0, 1, 1114320]] [["/rails/activesupport/lib/active_support/callbacks.rb", 165, :T_DATA], [29968, 0, 28422, 0, 2, 3675936]] ``` AllocationTracer after: ``` [["/rack/lib/rack/utils.rb", 499, :T_STRING], [50983, 4080, 67269, 0, 12, 1815600]] [["/rack/lib/rack/utils.rb", 662, :T_STRING], [33001, 0, 28420, 0, 2, 1230809]] [["/rack/lib/rack/body_proxy.rb", 34, :T_ARRAY], [29990, 0, 25812, 0, 1, 1118000]] [["/rails/activesupport/lib/active_support/subscriber.rb", 99, :T_STRING], [29986, 0, 25803, 0, 1, 1117840]] [["/rails/activesupport/lib/active_support/notifications/instrumenter.rb", 52, :T_HASH], [29984, 28, 26133, 0, 11, 4953280]]
* | NameError#missing_name? can jsut use NameError#name if the arg is a SymbolYuki Nishijima2015-02-071-2/+1
| | | | | | | | | | | | NameError#name returns a missing name as a symbol, so if the given name is a symbol, it doesn't have to use #missing_name to get the last constant name in the error message.
* | make zones_map privateTony Miller2015-02-062-9/+9
| | | | | | | | | | Conflicts: activesupport/lib/active_support/values/time_zone.rb
* | Merge branch 'rm-ntp'Rafael Mendonça França2015-02-064-27/+40
|\ \ | | | | | | | | | Merge #12067 rebasing and improving the code.
| * \ Merge pull request #12067 from jackxxu/keep_precisionRafael Mendonça França2015-02-064-27/+40
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable number_to_percentage to keep the number's precision by allowing :precision option value to be nil Conflicts: activesupport/CHANGELOG.md activesupport/lib/active_support/number_helper.rb activesupport/test/number_helper_test.rb
| | * | Enable number_to_percentage to keep the number's precision by allowing ↵Jack Xu2013-08-283-16/+31
| | | | | | | | | | | | | | | | | | | | | | | | :precision to be nil number_helper.number_to_percentage(1000, precision: nil) # => "1000%"
* | | | Revert "Improve the performance of HWIDA `select` and `reject`"Sean Griffin2015-02-061-4/+4
|/ / / | | | | | | | | | This reverts commit 9c47b874d112414df7f80f9ed852adb48ba6d268.
* | | Improve the performance of HWIDA `select` and `reject`Sean Griffin2015-02-061-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are (potentially, depending on input) called in several places in both the router, and Active Record. The code also becomes much cleaner. This results in ~33% performance gain in both methods. Calculating ------------------------------------- before 15.696k i/100ms after 19.865k i/100ms ------------------------------------------------- before 303.064k (± 2.6%) i/s - 1.523M after 446.734k (± 2.4%) i/s - 2.245M On Ruby 2.2, a warning will be emitted about states not being copied, because we're calling `super` from a subclass. We can safely ignore it, however, since we're converting the result back into a HWIDA
* | | Merge pull request #14028 from uberllama/json_escape_commentsRafael Mendonça França2015-02-061-0/+5
|\ \ \ | | | | | | | | Amended json_escape comments
| * | | Amended json_escape comment to clarify that user-generated content must ↵Yuval Kordov2014-02-121-0/+5
| | | | | | | | | | | | | | | | still be html_escaped if being inserted ingot he DOM via JQuery's html() method.
* | | | Merge pull request #18526 from vipulnsward/add-silence-streamRafael Mendonça França2015-02-052-16/+45
|\ \ \ \ | | | | | | | | | | Extracted silence_stream method to new module in activesupport/testing
| * | | | - Extracted silence_stream method to new module in activesupport/testing.Vipul A M2015-01-202-16/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added include for the same in ActiveSupport::Test. - Removed occurrences of silence_stream being used elsewhere. - Reordered activesupport testcase requires alphabetically. - Removed require of silence stream from test_case - Moved quietly method to stream helper - Moved capture output to stream helper module and setup requires for the same elsewhere
* | | | | Use keyword argumentsRafael Mendonça França2015-02-051-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Also remove the default value since it will be always passed and Array(nil) returns an empty array
* | | | | Merge pull request #18747 from vipulnsward/merge-skip-callbackRafael Mendonça França2015-02-051-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Rename AS::Callback#merge
| * | | | | Callback#merge merges options for a callback skip instead of a callback. ↵Vipul A M2015-02-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Renamed it to indicate what it actually does.
* | | | | | Privatize config_accessor as with attr_accessorAkira Matsuda2015-02-063-0/+13
| | | | | |