aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-04-114-8/+17
|\ | | | | | | | | 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
| |
| * Merge branch 'master' of github.com:rails/railsVijay Dev2013-03-3031-84/+178
| |\
| * | Revert "Using American English spellings over British style spellings"Vijay Dev2013-03-301-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 573df1cf2a5d5d1f288c8a4a5d76194675141832. Reason: changelog edits aren't allowed in docrails. [ci skip]
* | | Revert "Merge pull request #10158 from steveklabnik/issue_10125"Rafael Mendonça França2013-04-102-19/+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.
* | | Removed unused setupAnupam Choudhury2013-04-101-2/+0
| | |
* | | Fixed typoAnupam Choudhury2013-04-101-1/+1
| | |
* | | Merge pull request #10158 from steveklabnik/issue_10125Steve Klabnik2013-04-092-2/+19
|\ \ \ | | | | | | | | Fix inflector to respect default locale.
| * | | Fix inflector to respect default locale.Nick Cox2013-04-102-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Fix markdown formattingAgis Anastasopoulos2013-04-061-1/+1
| | |
* | | Add option to Class#class_attribute for skipping the query methodAgis-2013-04-063-5/+18
| | |
* | | `fast_xs` support has been removed. Use 'String#encode(xml: :attr)`.Aaron Patterson2013-04-053-19/+2
| | |
* | | 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
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 15:08:21 +0000