aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #10412 from vipulnsward/fix_callback_test_typoCarlos Antonio da Silva2013-05-021-1/+1
|\ | | | | Fix typo in test
| * Fix typo in testVipul A M2013-05-021-1/+1
| |
* | Fixes Dependency bug in Active SupportTomohiko Himura2013-05-023-0/+3
| | | | | | | | DateTime defined in date.rb
* | Fix failures in AS with minitest 4.7.4Carlos Antonio da Silva2013-05-011-0/+3
| |
* | Revert "Object#in? also accepts multiple parameters"Brian Morearty2013-05-012-29/+9
|/ | | | | | | | | | | | | | | | | | This reverts commit ebf69ab1636df74c76332c53bcd3d8494fb91b45. `in?` must not take multiple parameters because its behavior would be ambiguous: # Test if "B" is included in a list of names with `"B".in?(*names)`: names = ["BMorearty"] "B".in?(*names) # => true names = ["BMorearty","rubyduo"] "B".in?(*names) # => false Conflicts: activesupport/lib/active_support/core_ext/object/inclusion.rb activesupport/test/core_ext/object/inclusion_test.rb
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-05-011-6/+6
|\
| * documentation fixes for Array.wrap and AR::Validations::AssociatedValidatorHrvoje Šimić2013-04-171-6/+6
| |
* | Fix typos in deprecation proxy docs [ci skip]Carlos Antonio da Silva2013-04-301-3/+3
| |
* | Merge pull request #10339 from eiel/unused-requireRafael Mendonça França2013-04-301-1/+0
|\ \ | | | | | | remove unused require
| * | remove unused requireTomohiko Himura2013-04-251-1/+0
| | | | | | | | | | | | not used remove_possible_method
* | | rails/master is now 4.1.0.betaRafael Mendonça França2013-04-292-510/+3
| | |
* | | Bump version to rc1David Heinemeier Hansson2013-04-291-1/+1
| | |
* | | Merge pull request #10364 from wangjohn/refactoring_activesupport_cacheJeremy Kemper2013-04-281-10/+23
|\ \ \ | | | | | | | | Making the retrieval of the cache store class a method
| * | | Making the retrieval of the cache store class a method, also wrotewangjohn2013-04-281-10/+23
| | | | | | | | | | | | | | | | comments for the expand_cache_key method.
* | | | Use new hash syntax in module delegation docs [ci skip]Carlos Antonio da Silva2013-04-281-1/+1
|/ / /
* | | Module#delegate checks nilness rather that falsehood if :allow_nil is true, ↵Xavier Noria2013-04-262-30/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and avoids multiple evaluation of the target method Notes: 1) I hope nilness is a word. 2) See rationale for avoiding multiple evaluation in a comment in the patch, credit goes to @jeremy for pointing out this gotcha in the existing implementation. 3) Embeds a little joke dedicated to @pixeltrix (it could be worse! :D). References #10347.
* | | Merge pull request #9980 from stouset/patch-1Andrew White2013-04-261-4/+5
|\ \ \ | | | | | | | | | | | | | | | | Improve poor security recommendation in docs [ci skip]
| * | | Improve poor security recommendation in docsStephen Touset2013-03-281-4/+5
| | | | | | | | | | | | | | | | | | | | As reported in #9960, the current documentation recommends an insecure practice for key generation from a password (a single round of SHA-256). The modified documentation uses ActiveSupport::KeyGenerator to perform proper key stretching.
* | | | Merge pull request #10351 from ↵Xavier Noria2013-04-262-5/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | JonRowe/update_as_date_next_week_to_document_intent Propose better documentation for ActiveSupports `next_week` functionaility
| * | | | formattingJon Rowe2013-04-261-1/+1
| | | | |
| * | | | better document `next_week` functionaility closes #9568Jon Rowe2013-04-262-5/+10
| | |/ / | |/| |
* / | | Delegation method bugLi Ellis Gallardo2013-04-252-0/+19
|/ / / | | | | | | | | | | | | | | | Add documentation and test to delegation method that make sure we're aware that when a delegated object is not nil or false and doesn't respond to the method it will still raise a NoMethodError exception.
* | | refactor number helperVipul A M2013-04-251-2/+3
| | |
* | | Merge pull request #10318 from vipulnsward/refactor_obviousGuillermo Iguaran2013-04-231-4/+1
|\ \ \ | | | | | | | | refactor initialization of array
| * | | refactor initialization of arrayVipul A M2013-04-231-4/+1
| | | |
* | | | Adjust for daylight savings in String#to_timeAndrew White2013-04-232-10/+124
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The changes in b79adc4323 had a bug where if the time in the String was in standard time but the current time was in daylight savings then the calculated adjustment was off by an hour. This commit fixes this and adds extra tests for the following: * time in string is standard time, current time is standard time * time in string is standard time, current time is daylight savings * time in string is daylight savings, current time is standard time * time in string is daylight savings, current time is daylight savings Fixes #10306.
* | | remove redundant variableVipul A M2013-04-221-2/+0
| | |
* | | Created a registry based on the +PerThreadRegistry+ module forwangjohn2013-04-221-2/+20
| | | | | | | | | | | | subscriber queues. Helps limit the number of thread locals.
* | | Move CHANGELOG entry to topRafael Mendonça França2013-04-221-4/+4
| | | | | | | | | | | | [ci skip]
* | | Merge pull request #10096 from benofsky/fix_skipping_object_callback_filtersRafael Mendonça França2013-04-213-2/+43
|\ \ \ | | | | | | | | Fixes skipping object callback filters
| * | | Fixes skipping object callback filtersBen McRedmond2013-04-043-2/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows you to skip callbacks that are defined by objects, e.g. for `ActionController`: skip_after_filter MySpecialFilter Previously this didn't work due to a bug in how Rails compared callbacks in `Callback#matches?`. When a callback is compiled, if it's an object filter (i.e. not a method, proc, etc.), `Callback` now defines a method on `@klass` that is derived from the class name rather than `@callback_id`. So, when `skip_callback` tries to find the appropriate callback to remove, `Callback` can regenerate the method name for the filter object and return the correct value for `Callback#matches?`.
* | | | extract array to a constantVipul A M2013-04-221-1/+3
| | | |
* | | | symbolize_keys => symbolize_keys! on new hash;Vipul A M2013-04-191-1/+1
| | | | | | | | | | | | | | | | "There're" => There are for better readability
* | | | Merge pull request #10235 from joergleis/patch-1Michael Koziarski2013-04-181-5/+4
|\ \ \ \ | | | | | | | | | | Reorganize MessageEncryptor
| * | | | Reorganize MessageEncryptorjgls2013-04-191-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1) According to OpenSSL's documentation, cipher.random_iv must be called after cipher.encrypt and already sets the generated IV on the cipher. 2) OpenSSL::CipherError was moved to OpenSSL::Cipher::CipherError in Ruby 1.8.7. Since Rails 4 requires at least Ruby 1.9.3, support for the old location can be dropped.
* | | | | The increment and decrement commands in the local cache are exactly thewangjohn2013-04-171-18/+14
| | | | | | | | | | | | | | | | | | | | same, so their logic is being refactored.
* | | | | Refactored the storage of a temporary version of the local cache intowangjohn2013-04-171-8/+6
| | | | | | | | | | | | | | | | | | | | its own method.
* | | | | Add nodoc to LocalCacheRegistryRafael Mendonça França2013-04-171-1/+1
| | | | | | | | | | | | | | | [ci skip]
* | | | | Adding a local thread registry to store local caches.wangjohn2013-04-171-15/+32
| | | | |
* | | | | more descriptive NameError's messages for class attributesHrvoje Šimić2013-04-172-6/+8
| | | | |
* | | | | switch (and lazily convert) ivar names to 3.xSam Ruby2013-04-162-52/+51
| | | | |
* | | | | Copy-edits in the ActiveSupport::Subscriber documentation.Rafael Mendonça França2013-04-161-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thank you @fxn :green_heart::yellow_heart::heart::purple_heart::blue_heart: [ci skip]
* | | | | Merge pull request #10218 from dasch/dasch/extract-subscriber-classRafael Mendonça França2013-04-163-43/+89
|\ \ \ \ \ | |/ / / / |/| | | | Extract a Subscriber base class from LogSubscriber
| * | | | Extract a base class from ActiveSupport::LogSubscriberDaniel Schierbeck2013-04-163-43/+89
| | |_|/ | |/| | | | | | | | | | | | | | | | | | Adds a ActiveSupport::Subscriber base class that LogSubscriber inherits from. By inheriting from Subscriber, other kinds of subscribers can take advantage of the event attachment system.
* | | | The third argument of deprecation_warning is always optionalRafael Mendonça França2013-04-161-1/+1
| | | | | | | | | | | | [ci skip]
* | | | Fix documentation to the custom DeprecatorRafael Mendonça França2013-04-161-1/+1
| | | | | | | | | | | | [ci skip]
* | | | interpolate instead of string concatVipul A M2013-04-151-1/+1
|/ / /
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-04-131-1/+1
|\ \ \
| * | | Corrected paramter to parameterCarson McDonald2013-04-131-1/+1
| | | |
* | | | use define_singleton_method instead of class_evalFrancesco Rodriguez2013-04-131-4/+2
| | | |