aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into unlock-minitestRafael Mendonça França2017-08-01429-61/+1014
|\
| * fix typo in assert_changes error messageBoris Slobodin2017-07-311-1/+1
| |
| * Add missing support for modulo operations on durationsSayan Chakraborty2017-07-283-14/+131
| | | | | | | | | | | | | | | | | | | | | | Rails 5.1 introduce an `ActiveSupport::Duration::Scalar` class as a wrapper around a numeric value as a way of ensuring a duration was the outcome of an expression. However the implementation was missing support for modulo operations. This commit adds support for those operations and should result in a duration being returned from expressions involving them. Fixes #29603 and #29743.
| * Fix division where a duration is the denominatorAndrew White2017-07-273-15/+28
| | | | | | | | | | | | | | | | | | PR #29163 introduced a change in behavior when a duration was the denominator in a calculation - this was incorrect as dividing by a duration should always return a `Numeric`. The behavior of previous versions of Rails has been restored. Fixes #29592.
| * remove depreciated assertion to eliminate warningChristina Thompson2017-07-241-1/+1
| | | | | | | | Signed-off-by: Yuki Nishijima <yk.nishijima@gmail.com>
| * Merge pull request #29907 from deivid-rodriguez/fix_flaky_message_verifier_testKasper Timm Hansen2017-07-241-1/+1
| |\ | | | | | | Fix test failure in message verifier tests
| | * Fix test failure in message verifier testsDavid Rodríguez2017-07-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this, I get the following result on my machine ``` # Running: F Failure: MessageVerifierTest#test_backward_compatibility_messages_signed_without_metadata [/home/deivid/Code/rails/activesupport/test/message_verifier_test.rb:91]: --- expected +++ actual @@ -1 +1 @@ -{:some=>"data", :now=>2010-01-01 00:00:00 +0100} +{:some=>"data", :now=>2010-01-01 00:00:00 +0000} bin/test test/message_verifier_test.rb:89 ```
| * | add metadata tests: verify methodAssain2017-07-241-0/+15
| |/
| * [ci skip] Remove superfluous paragraphs; fully qualify constants.Kasper Timm Hansen2017-07-241-8/+2
| | | | | | | | | | | | | | The paragraphs retread ground covered by the title and the usage examples, so let's just remove them. [ Assain Jaleel & Kasper Timm Hansen ]
| * Merge pull request #29892 from assain/documenation_for_metadataKasper Timm Hansen2017-07-243-0/+100
| |\ | | | | | | Document metadata support for MessageEncryptor
| | * add to changelog: purpose and expiry supportAssain2017-07-241-0/+28
| | | | | | | | | | | | [ci skip]
| | * document metadata support added to message encryptor and message verifierAssain2017-07-242-0/+72
| | | | | | | | | | | | [ci skip]
| * | Merge pull request #29860 from georgeclaghorn/travel-back-automaticallyRafael França2017-07-242-4/+8
| |\ \ | | | | | | | | Remove time stubs after each test
| | * | Remove time stubs after each testGeorge Claghorn2017-07-222-4/+8
| | | | | | | | | | | | | | | | Reverts 7abb6e0.
| * | | Let Metadata instance handle purpose coercion.Kasper Timm Hansen2017-07-231-4/+4
| | | | | | | | | | | | | | | | [ Assain Jaleel & Kasper Timm Hansen ]
| * | | Remove dependency on `from_now` extension.Kasper Timm Hansen2017-07-231-1/+1
| | |/ | |/| | | | | | | [ Assain Jaleel & Kasper Timm Hansen ]
| * | add metadata support to message verifierAssain2017-07-192-6/+48
| | |
| * | Add expires_at, expires_in, and purpose meta_data to messages.Assain2017-07-194-6/+192
| | |
| * | Merge pull request #29757 from lugray/hash_with_indifferent_access_defaultSean Griffin2017-07-172-10/+56
| |\ \ | | | | | | | | Fix HashWithIndifferentAccess#default when include?(nil)
| | * | Fix HashWithIndifferentAccess#default when include?(nil)Lisa Ugray2017-07-172-10/+56
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | The implementation of HashWithIndifferentAccess#default didn't distinguish `default` from `default(nil)`, which caused an incorrect result for `default` if `nil` was used as a key. Define HashWithIndifferentAccess#dig so that hackery that behaves differently from Hash#default can be removed from HashWithIndifferentAccess#default.
| * | Merge pull request #29758 from glaucocustodio/patch-1 [ci skip]Sean Griffin2017-07-171-0/+10
| |\ \ | | | | | | | | Add documentation for class_attribute default option
| | * | Add documentation for class_attribute optionsGlauco Custódio2017-07-171-0/+10
| | | |
| * | | Merge branch 'master' into make-reverse-merge-bang-order-consistentSean Griffin2017-07-17430-3283/+5328
| |\ \ \
| | * | | Enable `Layout/FirstParameterIndentation` copRyuta Kamizono2017-07-172-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have some indentation cops. But now there is a little inconsistent params indentations. Enable `Layout/FirstParameterIndentation` cop to prevent newly inconsistent indentation added and auto-correct to existing violations.
| | * | | explain why require_relative is not used here [ci skip]Xavier Noria2017-07-161-0/+2
| | | | |
| | * | | Remove encoding utf-8 magic commentKoichi ITO2017-07-152-2/+0
| | | | |
| | * | | Fix doc format for `ActiveSupport::Testing::TimeHelpers` [ci skip]yuuji.yaginuma2017-07-151-2/+2
| | | | |
| | * | | Fix configuring third-party cache stores such as ↵George Claghorn2017-07-121-1/+1
| | | |/ | | |/| | | | | | | | | | | | | | | | | ActiveSupport::Cache::RedisStore Broken in 8da30ad.
| | * | [Active Support] `rubocop -a --only Layout/EmptyLineAfterMagicComment`Koichi ITO2017-07-11424-0/+424
| | |/
| | * :scissors:Ryuta Kamizono2017-07-111-1/+0
| | | | | | | | | | | | [ci skip]
| | * * Don't eagerly require Rails' minitest plugin.Kasper Timm Hansen2017-07-101-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By making the Rails minitest behave like a standard minitest plugin we're much more likely to not break when people use other minitest plugins. Like minitest-focus and pride. To do this, we need to behave like minitest: require files up front and then perform the plugin behavior via the at_exit hook. This also saves us a fair bit of wrangling with test file loading. Finally, since the environment and warnings options have to be applied as early as possible, and since minitest loads plugins at_exit, they have to be moved to the test command. * Don't expect the root method. It's likely this worked because we eagerly loaded the Rails minitest plugin and that somehow defined a root method on `Rails`. * Assign a backtrace to failed exceptions. Otherwise Minitest pukes when attempting to filter the backtrace (which Rails' backtrace cleaner then removes). Means the exception message test has to be revised too. This is likely caused by the rails minitest plugin now being loaded for these tests and assigning a default backtrace cleaner.
| * | Add CHANGELOG entry [skip ci]Erol Fornoles2017-03-061-0/+4
| | |
| * | Use method from HashErol Fornoles2017-03-061-1/+1
| | |
| * | Make the order of Hash#reverse_merge! consistent with HashWithIndifferentAccessErol Fornoles2017-03-062-4/+6
| | |
* | | Merge branch 'master' into unlock-minitestKasper Timm Hansen2017-07-15430-1818/+2533
|\ \ \ | | |/ | |/|
| * | Added time helper method `freeze_time` which is an alias for `travel_to ↵प्रथमेश Sonpatki2017-07-103-0/+47
| | | | | | | | | | | | Time.now` (#29681)
| * | Merge pull request #29730 from bdewater/update-encryptor-docsKasper Timm Hansen2017-07-091-5/+6
| |\ \ | | | | | | | | Update MessageEncryptor example to use dynamic key length
| | * | [ci skip] update MessageEncryptor example to use the key length as returned ↵Bart de Water2017-07-091-5/+6
| | | | | | | | | | | | | | | | by OpenSSL
| * | | Merge pull request #29728 from kirs/frozen-activesupportMatthew Draper2017-07-09428-0/+428
| |\ \ \ | | | | | | | | | | Use frozen-string-literal in ActiveSupport
| | * | | Use frozen-string-literal in ActiveSupportKir Shatrov2017-07-09428-0/+428
| | | | |
| * | | | Merge pull request #28668 from Dorian/mention-time-parse-argument-errorAaron Patterson2017-07-052-1/+13
| |\ \ \ \ | | | | | | | | | | | | Mention Time.zone.parse possibly throwing ArgumentError
| | * | | | Mention and test for possible ArgumentError when parsing timesDorian Marié2017-04-082-1/+13
| | | | | |
| * | | | | Fix warning: `*' interpreted as argument prefixRyuta Kamizono2017-07-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ``` /Users/kamipo/src/github.com/rails/rails/activesupport/test/core_ext/module_test.rb:402: warning: `*' interpreted as argument prefix /Users/kamipo/src/github.com/rails/rails/activesupport/test/core_ext/module_test.rb:420: warning: `*' interpreted as argument prefix ```
| * | | | | Merge pull request #29687 from k3rni/private-prefixed-delegateMatthew Draper2017-07-062-1/+39
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | Return prefixed method names from `Module.delegate`, if using prefixes
| | * | | | Use `map` in `delegate` so that actual prefixed method names are returned, ↵Krzysztof Zych2017-07-052-1/+40
| |/ / / / | | | | | | | | | | | | | | | if using prefix version.
| * | | | Merge branch 'master' into require_relative_2017Xavier Noria2017-07-0217-45/+46
| |\ \ \ \
| | * | | | Expectation firstAkira Matsuda2017-07-021-1/+1
| | | | | |
| | * | | | Revert "Merge pull request #29540 from kirs/rubocop-frozen-string"Matthew Draper2017-07-02428-428/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3420a14590c0e6915d8b6c242887f74adb4120f9, reversing changes made to afb66a5a598ce4ac74ad84b125a5abf046dcf5aa.
| | * | | | Merge pull request #29540 from kirs/rubocop-frozen-stringMatthew Draper2017-07-02428-0/+428
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Enforce frozen string in Rubocop
| | | * | | | Enforce frozen string in RubocopKir Shatrov2017-07-01428-0/+428
| | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 23:08:48 +0000