Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix warning: mismatched indentatmmismatched indentations at 'end' with 'def' | kennyj | 2013-03-19 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master-sec' | Aaron Patterson | 2013-03-18 | 4 | -2/+39 |
|\ | | | | | | | | | | | | | | | * 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 | 4 | -2/+39 |
| | | |||||
* | | Merge pull request #9774 from ↵ | Andrew White | 2013-03-18 | 1 | -0/+8 |
|\ \ | | | | | | | | | | | | | senny/9772_reraise_no_method_error_in_proper_context `TimeWithZone` raises `NoMethodError` in proper context. | ||||
| * | | `TimeWithZone` raises `NoMethodError` in proper context. | Yves Senn | 2013-03-18 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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_key | Vipul A M | 2013-03-18 | 2 | -2/+2 |
|/ / | |||||
* | | Merge pull request #9757 from vipulnsward/remove_message_param | Carlos Antonio da Silva | 2013-03-17 | 1 | -1/+1 |
|\ \ | | | | | | | remove unused parameter passed to assert_query_equal method | ||||
| * | | remove unused parameter passed to assert_query_equal method | Vipul A M | 2013-03-17 | 1 | -1/+1 |
| | | | |||||
* | | | refactor test to drop unnecessary hash creation, test directly instead | Vipul A M | 2013-03-17 | 1 | -16/+10 |
|/ / | |||||
* | | Revert "Merge pull request #8156 from fredwu/acronym_fix-master" | Steve Klabnik | 2013-03-16 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | 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 | -0/+2 |
| | | | | | | | | disregarding specified acronyms, fixes #8015 | ||||
* | | Revert "make new rails apps log to STDOUT" | Steve Klabnik | 2013-03-15 | 1 | -11/+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/+11 |
| | | |||||
* | | Add regression tests for #9678 | Andrew White | 2013-03-13 | 1 | -0/+16 |
| | | | | | | | | | | The bug with `ActiveSupport::TimeZone.parse` described in #9678 was unwittingly fixed in 005d910 so add some tests to prevent regression. | ||||
* | | Merge pull request #9681 from vipulnsward/fix_typo_in_module_name | Carlos Antonio da Silva | 2013-03-12 | 4 | -7/+7 |
|\ \ | | | | | | | Fix typo in DependenciesTestHelpers module name | ||||
| * | | Fix typo in DependenciesTestHelpers module name | Vipul A M | 2013-03-12 | 4 | -7/+7 |
| | | | |||||
* | | | Cleanup tests for unused variables | Vipul A M | 2013-03-11 | 2 | -3/+1 |
|/ / | |||||
* / | Fixed tests for returning an instance of `Time` in the local system timezone. | Paul Nikitochkin | 2013-03-10 | 1 | -5/+5 |
|/ | |||||
* | Fix deletion of empty directories: | Charles Jones | 2013-02-25 | 1 | -0/+12 |
| | | | | | | | | | | | | | | | 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. | ||||
* | Keep second fraction when DateTime#change is called. | Chris Baynes | 2013-02-25 | 1 | -0/+3 |
| | |||||
* | Added `ActiveSupport::TimeWithZone#to_r` for `Time#at` compatibility. | stopdropandrew | 2013-02-24 | 1 | -0/+11 |
| | |||||
* | Move number_to_human test from AP to AS | Carlos Antonio da Silva | 2013-02-22 | 1 | -0/+7 |
| | | | | | Since all changes from #9347 are related to AS, it seems proper that the test is placed there as well. | ||||
* | Added beginning_of_minute support to core_ext calculations for Time and DateTime | Gagan Awhad | 2013-02-21 | 3 | -0/+30 |
| | |||||
* | added compress options for gzip | Beyond | 2013-02-10 | 1 | -0/+18 |
| | | | | | | added test for compress options of gzip update changelog | ||||
* | Merge pull request #9128 from jamesotron/iso8601-sub-second-accuracy | Jeremy Kemper | 2013-02-06 | 1 | -1/+1 |
|\ | | | | | Modify TimeWithZone#as_json to return 3DP of sub-second accuracy. | ||||
| * | Modify TimeWithZone#as_json to return 3DP of sub-second accuracy by default, ↵ | James Harton | 2013-01-31 | 1 | -1/+1 |
| | | | | | | | | since it's allowed by the spec and is very useful. | ||||
* | | Missing require extract_options | Akira Matsuda | 2013-01-31 | 1 | -0/+1 |
|/ | |||||
* | Merge pull request #8830 from antoinelyset/master | Xavier Noria | 2013-01-28 | 1 | -3/+4 |
|\ | | | | | Improve String#squish whitespaces matching | ||||
| * | Improve String#squish whitespaces matching | Antoine Lyset | 2013-01-22 | 1 | -3/+4 |
| | | |||||
* | | Use Encoding::UTF_8 constant :do_not_litter: | Akira Matsuda | 2013-01-28 | 1 | -2/+2 |
| | | |||||
* | | Set Thread.abort_on_exception for the whole AS, AP, and AR tests | Akira Matsuda + Koichi Sasada | 2013-01-24 | 1 | -0/+2 |
| | | | | | | | | this would give us some more clues in case a test silently dies inside Thread | ||||
* | | Fix some wrong String extensions tests | Akira Matsuda | 2013-01-23 | 1 | -7/+9 |
| | | | | | | | | | | | | * ASCII_STRING was not an ASCII String * BYTE_STRING was not an in valid UTF-8 String * added an assertion for non-UTF-8 String | ||||
* | | Test String#dasherize | Akira Matsuda | 2013-01-23 | 1 | -0/+6 |
| | | |||||
* | | Test that rescue_from accepts a class name in String | Akira Matsuda | 2013-01-23 | 1 | -2/+1 |
| | | |||||
* | | Test Kernel#quietly | Akira Matsuda | 2013-01-23 | 1 | -0/+12 |
| | | |||||
* | | Test try! with a block | Akira Matsuda | 2013-01-23 | 1 | -0/+4 |
| | | |||||
* | | Test that DeprecatedConstantProxy does not warn when accessing its class | Akira Matsuda | 2013-01-23 | 1 | -0/+1 |
| | | |||||
* | | Missing AS::Deprecation::DeprecatedObjectProxy test | Akira Matsuda | 2013-01-23 | 1 | -0/+5 |
| | | |||||
* | | Test that a DateTime acts_like_date | Akira Matsuda | 2013-01-23 | 1 | -0/+4 |
|/ | |||||
* | Merge pull request #8671 from xuanxu/fix_irregular | Xavier Noria | 2013-01-21 | 1 | -0/+1 |
|\ | | | | | Inflector irregular singularize rules | ||||
| * | Inflector irregular singularize rules | Juanjo Bazán | 2013-01-01 | 1 | -0/+1 |
| | | |||||
* | | Use `DateTime.parse` inside `String#to_datetime` | Andrew White | 2013-01-21 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | Use the standard library's `DateTime.parse` because it's marginally faster and supports partial date/time strings. Benchmark: user system total real old 3.980000 0.000000 3.980000 ( 3.987606) new 3.640000 0.010000 3.650000 ( 3.641342) | ||||
* | | Standardise the return value of `to_time` | Andrew White | 2013-01-21 | 5 | -17/+63 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit standardises the return value of `to_time` to an instance of `Time` in the local system timezone, matching the Ruby core and standard library behavior. The default form for `String#to_time` has been changed from :utc to :local but research seems to suggest the latter is the more common form. Also fix an edge condition with `String#to_time` where the string has a timezone offset in it and the mode is :local. e.g: # Before: >> "2000-01-01 00:00:00 -0500".to_time(:local) => 2000-01-01 05:00:00 -0500 # After: >> "2000-01-01 00:00:00 -0500".to_time(:local) => 2000-01-01 00:00:00 -0500 Closes #2453 | ||||
* | | Fix failing test about date.order translation values | Carlos Antonio da Silva | 2013-01-19 | 1 | -1/+1 |
| | | | | | | | | Introduced in b718998f3e8e6f3d01ad138e40f08fbcc3736285. | ||||
* | | Test to allow Range including DateTime and DateTime::Infinity | gsphanikumar | 2013-01-14 | 1 | -0/+6 |
| | | | | | | | | Closes #8587 | ||||
* | | extract PerformanceTest into rails-performance_tests gem | Yves Senn | 2013-01-10 | 1 | -68/+0 |
| | | |||||
* | | adding start / finish on the instrumenter, adding tests for the class | Aaron Patterson | 2013-01-09 | 1 | -0/+50 |
| | | |||||
* | | Merge pull request #8859 from tehgeekmeister/master | Vijay Dev | 2013-01-09 | 1 | -2/+2 |
|\ \ | | | | | | | Fix a typo in a test. | ||||
| * | | s/messqage/message/ in message_encryptor_test.rb | Ezekiel Smithburg | 2013-01-09 | 1 | -2/+2 |
| | | | |||||
* | | | CVE-2013-0156: Safe XML params parsing. Doesn't allow symbols or yaml. | Jeremy Kemper | 2013-01-08 | 1 | -6/+22 |
| | | |