| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #10158 from steveklabnik/issue_10125 | Steve Klabnik | 2013-04-09 | 1 | -2/+2 |
| |\ | | | | | Fix inflector to respect default locale. | ||||
| | * | Fix inflector to respect default locale. | Nick Cox | 2013-04-10 | 1 | -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 the | wangjohn | 2013-04-09 | 1 | -5/+4 |
| | | | | | | | | | PerThreadRegistry module. | ||||
| * | | Creating a module so that per thread registries can be easily created as | wangjohn | 2013-04-09 | 1 | -0/+41 |
| |/ | | | | thread local variables. | ||||
| * | Creating an object to consolidate thread locals which hold the | wangjohn | 2013-04-08 | 1 | -1/+27 |
| | | | | | instrumenters for the AS::Notifications module. | ||||
| * | Add option to Class#class_attribute for skipping the query method | Agis- | 2013-04-06 | 1 | -3/+5 |
| | | |||||
| * | `fast_xs` support has been removed. Use 'String#encode(xml: :attr)`. | Aaron Patterson | 2013-04-05 | 2 | -19/+0 |
| | | |||||
| * | Revert "Merge pull request #10034 from ↵ | Rafael Mendonça França | 2013-04-04 | 1 | -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_filters | Rafael Mendonça França | 2013-04-04 | 1 | -1/+13 |
| |\ | | | | | Fixes skipping object callback filters | ||||
| | * | Fixes skipping object callback filters | Ben McRedmond | 2013-04-04 | 1 | -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_v2 | Steve Klabnik | 2013-04-03 | 1 | -0/+1 |
| |\ \ | | | | | | | add require to suppress warning; remove variable | ||||
| | * | | add require to suppress warning; remove variable | Vipul A M | 2013-04-04 | 1 | -0/+1 |
| | | | | |||||
| * | | | Fixed Typo | Prathamesh Sonpatki | 2013-04-04 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fix some railties test warnings | Vipul A M | 2013-04-03 | 1 | -3/+2 |
| |/ / | |||||
| * | | Rename DummyKeyGenerator -> LegacyKeyGenerator | Trevor Turk | 2013-04-02 | 1 | -1/+1 |
| | | | |||||
| * | | change merge to merge! in AS on new hashes | Vipul A M | 2013-04-02 | 2 | -2/+2 |
| |/ | |||||
| * | Merge pull request #9997 from vipulnsward/hash_destructive_merge | Carlos Antonio da Silva | 2013-03-30 | 2 | -2/+2 |
| |\ | | | | | Change merge to merge! to avoid creating new objects | ||||
| | * | change merge to merge! | Vipul A M | 2013-03-29 | 2 | -2/+2 |
| | | | |||||
| * | | Merge pull request #10007 from vipulnsward/fix_AS_typos | Carlos Antonio da Silva | 2013-03-30 | 1 | -1/+1 |
| |\ \ | | | | | | | Fix some typos in AS | ||||
| | * | | fix some typos in AS | Vipul A M | 2013-03-30 | 1 | -1/+1 |
| | |/ | |||||
| * | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2013-03-30 | 1 | -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 typos | Akira Matsuda | 2013-03-25 | 1 | -1/+1 |
| | | | |||||
| * | | determine_constant_from_test_name does not swallow NoMethodErrors [Yves Senn] | Xavier Noria | 2013-03-28 | 1 | -0/+2 |
| | | | |||||
| * | | Merge pull request #9523 from ↵ | Rafael Mendonça França | 2013-03-27 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | stopdropandrew/Instrumenter#instrument-yields-payload ActiveSupport::Notifications::Instrumenter#instrument should yield Conflicts: activesupport/CHANGELOG.md | ||||
| | * | | ActiveSupport::Notifications::Instrumenter#instrument should yield | stopdropandrew | 2013-03-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | its payload the same way that ActiveSupport::Notifications does. Fix spelling in test name. | ||||
| * | | | Fixed timezone mapping of Ulaanbaatar. | Zolzaya | 2013-03-27 | 1 | -1/+1 |
| | | | | |||||
| * | | | Updated docs due to removal of serializer accessor | Albert Lash | 2013-03-24 | 1 | -3/+3 |
| | | | | |||||
| * | | | Merge pull request #8501 from charliesome/version-to-s | Rafael Mendonça França | 2013-03-23 | 1 | -6/+7 |
| |\ \ \ | | | | | | | | | Add #to_s method to VERSION modules | ||||
| | * | | | Add version method to top level modules | Charlie Somerville | 2013-03-21 | 1 | -6/+7 |
| | | | | | |||||
| * | | | | Tidying up some require : removing useless sort and homogenizing with the ↵ | Intrepidd | 2013-03-20 | 1 | -2/+2 |
| |/ / / | | | | | | | | | | rest of the code the wat the includes are done | ||||
| * | | | remove unused payloads in blocks in caching instrumentation | Vipul A M | 2013-03-19 | 1 | -3/+3 |
| | | | | |||||
| * | | | Merge branch 'master-sec' | Aaron Patterson | 2013-03-18 | 1 | -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 Murphy | 2013-03-15 | 1 | -0/+6 |
| | | |/ | |/| | |||||
| * | | | `TimeWithZone` raises `NoMethodError` in proper context. | Yves Senn | 2013-03-18 | 1 | -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 Klabnik | 2013-03-16 | 1 | -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 Wu | 2013-03-17 | 1 | -1/+1 |
| | | | | | | | | | | | | | disregarding specified acronyms, fixes #8015 | ||||
| * | | | Revert "make new rails apps log to STDOUT" | Steve Klabnik | 2013-03-15 | 1 | -8/+0 |
| | | | | | | | | | | | | | | | | | | | This reverts commit b7d9d6e2cd5082d269dafbc0316e2107febe1451. Per discussion with @jeremy and @rubys on Campfire. | ||||
| * | | | make new rails apps log to STDOUT | Terence Lee | 2013-03-15 | 1 | -0/+8 |
| | | | | |||||
| * | | | removing out of date comment. ↵ | Aaron Patterson | 2013-03-12 | 1 | -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_method | Aaron Patterson | 2013-03-12 | 1 | -23/+28 |
| | | | | |||||
| * | | | Remove manual "return true" from AS::TZ match method | Carlos Antonio da Silva | 2013-03-12 | 1 | -1/+1 |
| | | | | |||||
| * | | | included "Montevideo" in list of time zone aliases (closes Issue #9628) | Gernot | 2013-03-09 | 1 | -0/+1 |
| |/ / | |||||
| * | | Call String#gsub with Hash directly | Aman Gupta | 2013-03-04 | 1 | -2/+2 |
| | | | |||||
| * | | only calculate next_id when we need a new method defined | Aaron Patterson | 2013-03-04 | 1 | -1/+2 |
| |/ | |||||
| * | Fix deletion of empty directories: | Charles Jones | 2013-02-25 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | 1. When comparing the directory to delete against the top level cache_path, use File.realpath to make sure we aren't comparing two unequal strings that point to the same path. This occurs, for example, when cache_path has a trailing slash, which it does in the default Rails configuration. Since the input to delete_empty_directories never has a trailing slash, the comparison will never be true and the top level cache directory (and above) may be deleted. However… 2. File.delete raises EPERM when trying to delete a directory, so no directories have ever been deleted. Changing the code to Dir.delete fixes that. | ||||
| * | Preparing for 4.0.0.beta1 release | David Heinemeier Hansson | 2013-02-25 | 1 | -1/+1 |
| | | |||||
| * | Keep second fraction when DateTime#change is called. | Chris Baynes | 2013-02-25 | 1 | -1/+1 |
| | | |||||
| * | Revert "Simplify code in AS json encoder" | Guillermo Iguaran | 2013-02-25 | 1 | -8/+15 |
| | | | | | | | This reverts commit 046e27a7338f2961c10e9d133e0e2229b51c2ba8. Check https://github.com/rails/rails/pull/8815#issuecomment-14026122 for details. | ||||
| * | Merge pull request #8815 from bogdan/simplified-to-json-args | Steve Klabnik | 2013-02-24 | 1 | -15/+8 |
| |\ | | | | | AS JSON encoder: remove monkey patch of Array | ||||
| | * | Simplify code in AS json encoder | Bogdan Gusiev | 2013-01-06 | 1 | -15/+8 |
| | | | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |