aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
* | only calculate next_id when we need a new method definedAaron Patterson2013-03-041-1/+2
|/
* Fix deletion of empty directories:Charles Jones2013-02-251-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 releaseDavid Heinemeier Hansson2013-02-251-1/+1
|
* Keep second fraction when DateTime#change is called.Chris Baynes2013-02-251-1/+1
|
* Revert "Simplify code in AS json encoder"Guillermo Iguaran2013-02-251-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-argsSteve Klabnik2013-02-241-15/+8
|\ | | | | AS JSON encoder: remove monkey patch of Array
| * Simplify code in AS json encoderBogdan Gusiev2013-01-061-15/+8
| |
* | Added `ActiveSupport::TimeWithZone#to_r` for `Time#at` compatibility.stopdropandrew2013-02-241-0/+4
| |
* | Revert "prevent minitest from printing a --seed run option"Xavier Noria2013-02-241-12/+2
| | | | | | | | | | | | | | | | | | Reason: on a second thought, minitest prints a seed as run option regardless of the test order, and it actually calls srand, so albeit it might be misleading I believe, it is the way it is and should be left that way. This reverts commit c15862ae0cb876d745609170f0f90a9bb9b5e0ae.
* | prevent minitest from printing a --seed run optionXavier Noria2013-02-241-2/+12
| | | | | | | | See the first FIXME comment in the patch for the rationale.
* | Merge pull request #9347 from hoffm/number_to_human_bugSteve Klabnik2013-02-221-1/+1
|\ \ | | | | | | Address edge case for number_to_human with units option.
| * | Address edge case for number_to_human with units option.hoffm2013-02-221-1/+1
| | | | | | | | | | | | | | | | | | ActiveSupport::NumberHelper#number_to_human now returns the number unaltered when the units hash does not contain the needed key, e.g. when the number provided is less than the largest key provided.
* | | Correct comment for (beginning|end)_of_minuteGert Goet2013-02-222-4/+4
|/ /
* | Added beginning_of_minute support to core_ext calculations for Time and DateTimeGagan Awhad2013-02-212-0/+27
| |
* | Bump up minitest dependency and remove our own reinvented version of ↵Akira Matsuda2013-02-191-37/+1
| | | | | | | | ParallelEach
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-02-151-2/+2
|\ \ | | | | | | | | | | | | Conflicts: guides/source/upgrading_ruby_on_rails.md
| * | Change Class#subclasses doc exampleDalibor Nasevic2013-02-061-2/+2
| | |
* | | Supress warning about method redifinitionRyunosuke SATO2013-02-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | In i18n gem, the following methods are defined. - `Hash#except` - `Hash#slice` But if there are defined already, i18n skips these definitions. So these definition by `active_support` are required before `require 'i18n'`.
* | | Merge pull request #9238 from norman/unicode_62Carlos Antonio da Silva2013-02-102-1/+1
|\ \ \ | | | | | | | | Update to latest Unicode data.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 20:19:19 +0000