aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Merge pull request #10034 from ↵Rafael Mendonça França2013-04-043-33/+1
| | | | | | | | | benofsky/fix_skipping_object_callback_filters" This reverts commit c79c6980647eb76bfa52178711fb04ba7e9d403b, reversing changes made to ba4c27479add60b783a0e623c8a5d176c1dc9043. This broke all the tests. See https://travis-ci.org/rails/rails/builds/6061839
* Merge pull request #10034 from benofsky/fix_skipping_object_callback_filtersRafael Mendonça França2013-04-043-1/+33
|\ | | | | Fixes skipping object callback filters
| * Fixes skipping object callback filtersBen McRedmond2013-04-043-1/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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?`.
* | Further simplify enumerable group_by testCarlos Antonio da Silva2013-04-041-3/+1
| |
* | Replaced inject with mapAnupam Choudhury2013-04-041-2/+2
| |
* | Removed unused comma after loop variableAnupam Choudhury2013-04-041-1/+1
| |
* | Merge pull request #10080 from vipulnsward/railties_warning_fix_v2Steve Klabnik2013-04-031-0/+1
|\ \ | | | | | | add require to suppress warning; remove variable
| * | add require to suppress warning; remove variableVipul A M2013-04-041-0/+1
| | |
* | | Fixed TypoPrathamesh Sonpatki2013-04-041-1/+1
| | |
* | | Fix some railties test warningsVipul A M2013-04-031-3/+2
|/ /
* | Rename DummyKeyGenerator -> LegacyKeyGeneratorTrevor Turk2013-04-021-1/+1
| |
* | Merge pull request #10041 from vipulnsward/more_destructive_mergeSantiago Pastorino2013-04-022-2/+2
|\ \ | | | | | | change merge to merge! in AS on new hashes
| * | change merge to merge! in AS on new hashesVipul A M2013-04-022-2/+2
| |/
* / Added missing assertAnupam Choudhury2013-04-026-25/+37
|/
* Merge pull request #9997 from vipulnsward/hash_destructive_mergeCarlos Antonio da Silva2013-03-302-2/+2
|\ | | | | Change merge to merge! to avoid creating new objects
| * change merge to merge!Vipul A M2013-03-292-2/+2
| |
* | Merge pull request #10007 from vipulnsward/fix_AS_typosCarlos Antonio da Silva2013-03-303-14/+14
|\ \ | | | | | | Fix some typos in AS
| * | fix some typos in ASVipul A M2013-03-303-14/+14
| |/
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-03-302-4/+4
|\ \ | |/ |/| | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb activerecord/test/cases/adapter_test.rb guides/source/testing.md [ci skip]
| * Fix some typosAkira Matsuda2013-03-251-1/+1
| |
| * Using American English spellings over British style spellingsPrathamesh Sonpatki2013-03-211-3/+3
| |
* | determine_constant_from_test_name does not swallow NoMethodErrors [Yves Senn]Xavier Noria2013-03-282-0/+12
| |
* | Merge pull request #9523 from ↵Rafael Mendonça França2013-03-274-2/+16
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | stopdropandrew/Instrumenter#instrument-yields-payload ActiveSupport::Notifications::Instrumenter#instrument should yield Conflicts: activesupport/CHANGELOG.md
| * | ActiveSupport::Notifications::Instrumenter#instrument should yieldstopdropandrew2013-03-024-3/+16
| | | | | | | | | | | | its payload the same way that ActiveSupport::Notifications does. Fix spelling in test name.
* | | Fixed timezone mapping of Ulaanbaatar.Zolzaya2013-03-271-1/+1
| | |
* | | Bump TZInfo version to 0.3.37 based on version v2013b of the underlying tz data.kennyj2013-03-261-1/+1
| | |
* | | Updated docs due to removal of serializer accessorAlbert Lash2013-03-241-3/+3
| | |
* | | Merge pull request #8501 from charliesome/version-to-sRafael Mendonça França2013-03-231-6/+7
|\ \ \ | | | | | | | | Add #to_s method to VERSION modules
| * | | Add version method to top level modulesCharlie Somerville2013-03-211-6/+7
| | | |
* | | | Tidying up some require : removing useless sort and homogenizing with the ↵Intrepidd2013-03-201-2/+2
|/ / / | | | | | | | | | rest of the code the wat the includes are done
* | | remove unused payloads in blocks in caching instrumentationVipul A M2013-03-191-3/+3
| | |
* | | Fix warning: mismatched indentatmmismatched indentations at 'end' with 'def'kennyj2013-03-191-1/+1
| | |
* | | Revert "instruct RDoc to only parse Ruby files under lib [Fixes #9779]"Xavier Noria2013-03-181-1/+1
| | | | | | | | | | | | This reverts commit c24528fbc94dea9946a563be3bed9559583bdc57.
* | | instruct RDoc to only parse Ruby files under lib [Fixes #9779]Xavier Noria2013-03-181-1/+1
| | |
* | | Merge branch 'master-sec'Aaron Patterson2013-03-185-2/+45
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master-sec: fix protocol checking in sanitization [CVE-2013-1857] JDOM XXE Protection [CVE-2013-1856] fix incorrect ^$ usage leading to XSS in sanitize_css [CVE-2013-1855] stop calling to_sym when building arel nodes [CVE-2013-1854]
| * | | JDOM XXE Protection [CVE-2013-1856]Ben Murphy2013-03-155-2/+45
| | | |
* | | | Merge pull request #9774 from ↵Andrew White2013-03-183-0/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | senny/9772_reraise_no_method_error_in_proper_context `TimeWithZone` raises `NoMethodError` in proper context.
| * | | | `TimeWithZone` raises `NoMethodError` in proper context.Yves Senn2013-03-183-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #9772. `TimeWithZone` delegates everything to the wrapped `Time` object using `method_missing`. The result is that `NoMethodError` error will be raised in the context of `Time` which leads to a misleading debug output.
* | | | | fix repeat of test; remove unused variable by use of each_keyVipul A M2013-03-182-2/+2
|/ / / /
* | | | Merge pull request #9757 from vipulnsward/remove_message_paramCarlos Antonio da Silva2013-03-171-1/+1
|\ \ \ \ | | | | | | | | | | remove unused parameter passed to assert_query_equal method
| * | | | remove unused parameter passed to assert_query_equal methodVipul A M2013-03-171-1/+1
| | | | |
* | | | | Merge pull request #9758 from vipulnsward/remove_from_rakefileCarlos Antonio da Silva2013-03-171-2/+0
|\ \ \ \ \ | | | | | | | | | | | | Remove extra lines from Rakefile, which threw warning
| * | | | | extra lines from Rakefile removed, which also threw warningVipul A M2013-03-171-2/+0
| |/ / / /
* / / / / refactor test to drop unnecessary hash creation, test directly insteadVipul A M2013-03-171-16/+10
|/ / / /
* | | | Revert "Merge pull request #8156 from fredwu/acronym_fix-master"Steve Klabnik2013-03-163-8/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 867dc1700f32aae6f98c4651bd501597e6b52bc0, reversing changes made to 9a421aaa8285cf2a7ecb1af370748b0337818930. This breaks anyone who's using ForceSSL: https://travis-ci.org/rails-api/rails-api/jobs/5556065 Please see comments on #8156 for some discussion.
* | | | revises the CHANGELOG entry from 26aa265 [ci skip]Xavier Noria2013-03-161-2/+3
| | | |
* | | | Added Inflector#underscore fix to the changelogFred Wu2013-03-171-0/+4
| | | |
* | | | Fixed a bug where the inflector would replace camelCase strings and ↵Fred Wu2013-03-172-1/+3
| | | | | | | | | | | | | | | | disregarding specified acronyms, fixes #8015
* | | | Revert "make new rails apps log to STDOUT"Steve Klabnik2013-03-152-19/+0
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b7d9d6e2cd5082d269dafbc0316e2107febe1451. Per discussion with @jeremy and @rubys on Campfire.
* | | | make new rails apps log to STDOUTTerence Lee2013-03-152-0/+19
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 10:37:34 +0000