Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Move delegation error constant to inside Module | Carlos Antonio da Silva | 2013-06-26 | 1 | -1/+1 |
| | |||||
* | Merge pull request #10828 from southpolesteve/delegation_error_class | Yves Senn | 2013-06-26 | 1 | -1/+1 |
|\ | | | | | Create DelegationError class | ||||
| * | Add DelegationError class. Rasied by delegation to a nil object | Steve Faulkner | 2013-06-26 | 1 | -1/+1 |
| | | |||||
* | | Fix BacktraceCleaner#noise for multiple silencers. | Mark J. Titorenko | 2013-06-20 | 1 | -0/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous implementation of BacktraceSilencer#noise did not work correctly if more than one silencer was configured -- specifically, it would only return noise which was matched by all silencers. The new implementation is such that anything that has been matched by silencers is removed from the backtrace using Array#- (array difference), ie. we now return all elements within a backtrace that have been matched by any silencer (and are thus removed by #silence). Fixes #11030. | ||||
* | | Rewind StringIO instances before be parsed again | Paco Guzman | 2013-06-16 | 5 | -0/+5 |
| | | |||||
* | | Use xml instead already parsed xml | Paco Guzman | 2013-06-16 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #10727 from pacoguzman/fix-xml-mini-tests | Rafael Mendonça França | 2013-06-15 | 6 | -6/+6 |
|\ \ | | | | | | | Fix XmlMini different backends tests | ||||
| * | | Compare with the parsed result from REXML backend | Paco Guzman | 2013-05-22 | 6 | -6/+6 |
| | | | |||||
* | | | Merge pull request #10740 from mrsimo/hash-with-indifferent-access-select | Rafael Mendonça França | 2013-06-14 | 1 | -0/+30 |
|\ \ \ | | | | | | | | | HashWithIndifferentAccess#select working as intended | ||||
| * | | | HashWithIndifferentAccess#select working as intended | Albert Llop | 2013-05-23 | 1 | -0/+30 |
| |/ / | | | | | | | | | | | | | | | | Before this commit, #reject returned a HashWithIndifferentAccess, whereas #select returned a Hash. Now #select also returns a HashWithIndifferentAccess. | ||||
* | | | Merge pull request #10943 from killthekitten/10932_constantize_empty | Xavier Noria | 2013-06-14 | 1 | -4/+4 |
|\ \ \ | | | | | | | | | Fix #10932. Treat "" and "::" as invalid on constantize | ||||
| * | | | Fix #10932. Treat "" and "::" as invalid on constantize | Nikolay Shebanov | 2013-06-14 | 1 | -4/+4 |
| | | | | |||||
* | | | | Add missing nsec test for 17f5d8e | Andrew White | 2013-06-13 | 1 | -0/+5 |
| | | | | |||||
* | | | | Keep sub-second resolution when wrapping a DateTime value | Andrew White | 2013-06-13 | 2 | -0/+15 |
|/ / / | | | | | | | | | | | | | | | | | | | Add `DateTime#usec` and `DateTime#nsec` so that `ActiveSupport::TimeWithZone` keeps sub-second resolution when wrapping a `DateTime` value. Fixes #10855 | ||||
* | | | Drop extra variable from test | Vipul A M | 2013-06-12 | 1 | -2/+2 |
| | | | |||||
* | | | Don't blindly call blame_file! on exceptions in ↵ | Andrew Kreiling | 2013-06-09 | 2 | -0/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActiveSupport::Dependencies::Loadable It is possible under some environments to receive an Exception that is not extended with Blamable (e.g. JRuby). ActiveSupport::Dependencies::Loadable#load_dependency blindly call blame_file! on the exception which throws it's own NoMethodError exception and hides the original Exception. This commit fixes #9521 | ||||
* | | | Override Time.at to work with Time-like values | Andrew White | 2013-06-08 | 1 | -0/+22 |
| | | | | | | | | | | | | | | | | | | | | | Time.at allows passing a single Time argument which is then converted to an integer. The conversion code since 1.9.3r429 explicitly checks for an instance of Time so we need to override it to allow DateTime and ActiveSupport::TimeWithZone values. | ||||
* | | | Merge pull request #10784 from senny/10526_prevent_key_transformation | Rafael Mendonça França | 2013-06-03 | 1 | -0/+7 |
|\ \ \ | |_|/ |/| | | Prevent side effects in `Hash#with_indifferent_access`. | ||||
| * | | Prevent side effects in `Hash#with_indifferent_access`. | Yves Senn | 2013-05-29 | 1 | -0/+7 |
| | | | |||||
* | | | Allow Date to be compared with Time (like it was possible to compare Time ↵ | David Heinemeier Hansson | 2013-06-03 | 1 | -0/+4 |
| | | | | | | | | | | | | with Date) | ||||
* | | | Remove active_support/testing/pending.rb was deprecated. | kennyj | 2013-06-01 | 1 | -11/+0 |
| | | | |||||
* | | | Remove active_support/json/variable was deprecated. | kennyj | 2013-06-01 | 1 | -7/+0 |
| | | | |||||
* | | | Running isolated tests | Arun Agrawal | 2013-05-28 | 1 | -16/+0 |
|/ / | | | | | | | These stopped running don't know when. But these should be running now. | ||||
* | | Merge pull request #10763 from senny/10758_to_sentence_with_blank_elements | Carlos Antonio da Silva | 2013-05-26 | 1 | -0/+4 |
|\ \ | | | | | | | test-case for `Array#to_sentence` with `blank?` items. | ||||
| * | | add test-case for `Array#to_sentence with blank items. | Yves Senn | 2013-05-26 | 1 | -0/+4 |
| |/ | |||||
* / | Fix some typo in method names, variables | Vipul A M | 2013-05-26 | 4 | -4/+4 |
|/ | |||||
* | Bug fix: Evented notification subscribers can handle published events | Carl Lerche | 2013-05-17 | 1 | -0/+22 |
| | |||||
* | Merge pull request #10652 from md5/concern-multiple-included | Rafael Mendonça França | 2013-05-16 | 1 | -0/+14 |
|\ | | | | | Raise an error when multiple included blocks are defined for a Concern | ||||
| * | Raise when multiple included blocks are defined | Mike Dillon | 2013-05-16 | 1 | -0/+14 |
| | | |||||
* | | Merge pull request #10527 from zenspider/squishy_minitest5 | Aaron Patterson | 2013-05-16 | 2 | -111/+1 |
|\ \ | |/ |/| | Squishy minitest5 | ||||
| * | Updates to make rails 4 happy with minitest 5: | Ryan Davis | 2013-05-06 | 2 | -111/+1 |
| | | | | | | | | | | | | | | | | | | | | + Namespace changes, overhaul of runners. + Internal ivar name changes - Removed a logger globally applied to tests that spew everywhere?!? + Override Minitest#__run to sort tests by name. + Reworked testing isolation to work with the new cleaner architecture. - Removed a bunch of tests that just test minitest straight up. I think these changes were all merged to minitest 4 a long time ago. - Minor report output differences. | ||||
* | | remove deprecation notices | Aaron Patterson | 2013-05-15 | 1 | -16/+0 |
| | | |||||
* | | Fix HWIA#to_hash behavior with array of hashes. | kennyj | 2013-05-16 | 1 | -0/+5 |
| | | |||||
* | | deprecating string based terminators | Aaron Patterson | 2013-05-14 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #10266 from vipulnsward/fix_HIA_to_hash | Rafael Mendonça França | 2013-05-14 | 1 | -0/+4 |
|\ \ | | | | | | | fix HashWithIndifferentAccess#to_hash behaviour | ||||
| * | | fix HashWithIndifferentAccess#to_hash behaviour | Vipul A M | 2013-04-19 | 1 | -0/+4 |
| | | | |||||
* | | | Merge branch 'master' into normalizecb | Aaron Patterson | 2013-05-14 | 1 | -1/+2 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | * master: private callback methods should work Update mail to minimum version 2.5.4 | ||||
| * | | | private callback methods should work | Aaron Patterson | 2013-05-14 | 1 | -1/+2 |
| | | | | |||||
* | | | | Merge branch 'master' into normalizecb | Aaron Patterson | 2013-05-13 | 1 | -0/+40 |
|\| | | | | | | | | | | | | | | | | | | | * master: adding more callback type coverage | ||||
| * | | | adding more callback type coverage | Aaron Patterson | 2013-05-13 | 1 | -0/+40 |
| | | | | |||||
* | | | | pass the actual filter, not a string | Aaron Patterson | 2013-05-13 | 1 | -1/+1 |
|/ / / | |||||
* | | | add tests for reset_calbacks | Aaron Patterson | 2013-05-13 | 1 | -0/+40 |
| | | | |||||
* | | | Replace multi_json with json | Erik Michaels-Ober | 2013-05-11 | 1 | -23/+13 |
| | | | |||||
* | | | Merge pull request #10534 from cmaruz/master | Rafael Mendonça França | 2013-05-10 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Escape of U+2028 and U+2029 in the JSON Encoder Conflicts: activesupport/lib/active_support/json/encoding.rb | ||||
| * | | | Added escaping of U+2028 and U+2029 inside the json encoder. | Mario Caropreso | 2013-05-09 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | U+2028 and U+2029 are allowed inside strings in JSON (as all literal Unicode characters) but JavaScript defines them as newline seperators. Because no literal newlines are allowed in a string, this causes a ParseError in the browser. We work around this issue by replacing them with the escaped version. The resulting JSON is still valid and can be parsed in the browser. This commit has been coauthored with Viktor Kelemen @yikulju | ||||
* | | | | remove redundant var | Vipul A M | 2013-05-09 | 1 | -1/+0 |
| | | | | |||||
* | | | | add test for object conditional with scope | Aaron Patterson | 2013-05-08 | 1 | -0/+19 |
| | | | | |||||
* | | | | adding a class conditional test | Aaron Patterson | 2013-05-08 | 1 | -0/+12 |
| | | | | |||||
* | | | | adding tests for lambdas as conditions | Aaron Patterson | 2013-05-08 | 1 | -0/+40 |
|/ / / | |||||
* | | | we need to indicate the type of callback | Aaron Patterson | 2013-05-08 | 1 | -2/+2 |
| | | |