aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib
Commit message (Collapse)AuthorAgeFilesLines
* Corrected paramter to parameterCarson McDonald2013-04-131-1/+1
|
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-04-113-5/+14
|\ | | | | | | | | Conflicts: guides/source/action_mailer_basics.md
| * fix Array#uniq_by! docs [ci skip]Francesco Rodriguez2013-04-041-2/+2
| |
| * add documentation to Benchmark#ms [ci skip]Francesco Rodriguez2013-04-041-0/+7
| |
| * fix broken format in Array#to_sentence [ci skip]Francesco Rodriguez2013-04-041-3/+5
| |
* | Revert "Merge pull request #10158 from steveklabnik/issue_10125"Rafael Mendonça França2013-04-101-2/+2
| | | | | | | | | | | | | | | | This reverts commit fa3ef8e82ab2f96cf15ef9bc885b2468fad77621, reversing changes made to e0af93dd3a5eeee2e2a67b05f34afb66cc80c00b. Reason: Routes, Active Record and the rendering stack should not depend on the default locale
* | Using public send instead of send for the PerThreadRegistry module.wangjohn2013-04-101-1/+1
| | | | | | | | Prevents you from accidentally calling a protected method.
* | Merge pull request #10158 from steveklabnik/issue_10125Steve Klabnik2013-04-091-2/+2
|\ \ | | | | | | Fix inflector to respect default locale.
| * | Fix inflector to respect default locale.Nick Cox2013-04-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | The inflector was made aware of locales in 7db0b073fec6bc3e6f213b58c76e7f43fcc2ab97, but it defaulted to :en. That should actually be our default locale instead. Fixes #10125
* | | Changed the ScopeRegistry and the InstrumentationRegistry to use thewangjohn2013-04-091-5/+4
| | | | | | | | | | | | PerThreadRegistry module.
* | | Creating a module so that per thread registries can be easily created aswangjohn2013-04-091-0/+41
|/ / | | | | | | thread local variables.
* | Creating an object to consolidate thread locals which hold thewangjohn2013-04-081-1/+27
| | | | | | | | instrumenters for the AS::Notifications module.
* | Add option to Class#class_attribute for skipping the query methodAgis-2013-04-061-3/+5
| |
* | `fast_xs` support has been removed. Use 'String#encode(xml: :attr)`.Aaron Patterson2013-04-052-19/+0
| |
* | Revert "Merge pull request #10034 from ↵Rafael Mendonça França2013-04-041-13/+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-041-1/+13
|\ \ | | | | | | Fixes skipping object callback filters
| * | Fixes skipping object callback filtersBen McRedmond2013-04-041-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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?`.
* | | 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
| | |
* | | change merge to merge! in AS on new hashesVipul A M2013-04-022-2/+2
|/ /
* | 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-301-1/+1
|\ \ \ | |_|/ |/| | Fix some typos in AS
| * | fix some typos in ASVipul A M2013-03-301-1/+1
| |/
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-03-301-1/+1
|\ \ | |/ |/| | | | | | | | | | | | | 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
| |
* | determine_constant_from_test_name does not swallow NoMethodErrors [Yves Senn]Xavier Noria2013-03-281-0/+2
| |
* | Merge pull request #9523 from ↵Rafael Mendonça França2013-03-271-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | stopdropandrew/Instrumenter#instrument-yields-payload ActiveSupport::Notifications::Instrumenter#instrument should yield Conflicts: activesupport/CHANGELOG.md
| * | ActiveSupport::Notifications::Instrumenter#instrument should yieldstopdropandrew2013-03-021-1/+1
| | | | | | | | | | | | its payload the same way that ActiveSupport::Notifications does. Fix spelling in test name.
* | | Fixed timezone mapping of Ulaanbaatar.Zolzaya2013-03-271-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
| | |
* | | Merge branch 'master-sec'Aaron Patterson2013-03-181-0/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-151-0/+6
| | |/ | |/|
* | | `TimeWithZone` raises `NoMethodError` in proper context.Yves Senn2013-03-181-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Revert "Merge pull request #8156 from fredwu/acronym_fix-master"Steve Klabnik2013-03-161-1/+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.
* | | Fixed a bug where the inflector would replace camelCase strings and ↵Fred Wu2013-03-171-1/+1
| | | | | | | | | | | | disregarding specified acronyms, fixes #8015
* | | Revert "make new rails apps log to STDOUT"Steve Klabnik2013-03-151-8/+0
| | | | | | | | | | | | | | | | | | This reverts commit b7d9d6e2cd5082d269dafbc0316e2107febe1451. Per discussion with @jeremy and @rubys on Campfire.
* | | make new rails apps log to STDOUTTerence Lee2013-03-151-0/+8
| | |
* | | removing out of date comment. ↵Aaron Patterson2013-03-121-3/+0
| | | | | | | | | | | | :heart::heart::heart::heart::heart::heart::heart::heart::heart::heart::heart::heart: @pixeltrix
* | | drop memory consumption and startup speed by switching to define_methodAaron Patterson2013-03-121-23/+28
| | |
* | | Remove manual "return true" from AS::TZ match methodCarlos Antonio da Silva2013-03-121-1/+1
| | |
* | | included "Montevideo" in list of time zone aliases (closes Issue #9628)Gernot2013-03-091-0/+1
|/ /
* | Call String#gsub with Hash directlyAman Gupta2013-03-041-2/+2
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-26 11:11:08 +0000