Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Simplify String#mb_chars and stop proxying #class | Steve Klabnik | 2012-11-28 | 3 | -6/+7 |
| | | | | | | | | This behavior mattered under Ruby 1.8, but that doesn't matter now that we don't support it. In addition, we don't want to proxy the #class method. A test was added to prevent against regressions. | ||||
* | Fix documentation for String#mb_chars. | Steve Klabnik | 2012-11-28 | 1 | -4/+1 |
| | | | | This documentation has been out of date. | ||||
* | prevent Dependencies#remove_const from autoloading parents [fixes #8301] | Xavier Noria | 2012-11-28 | 2 | -32/+54 |
| | |||||
* | Properly deprecate #pending from AS::TestCase | Carlos Antonio da Silva | 2012-11-18 | 3 | -8/+10 |
| | | | | Check https://github.com/rails/rails/pull/4575#issuecomment-5765575. | ||||
* | Revert "Merge pull request #4575 from carlosantoniodasilva/remove-test-pending" | Carlos Antonio da Silva | 2012-11-18 | 3 | -2/+22 |
| | | | | | | | | | This reverts commit 1620df78dff527b4fa3f7b204fa05d1b630aae17, reversing changes made to 2d000328dfc0d4b297fb4bdcebc9af6c2fb559dc. Conflicts: activesupport/CHANGELOG.md activesupport/lib/active_support/test_case.rb | ||||
* | Please use assert_equal instead of diff directly | Ryan Davis | 2012-11-17 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-11-17 | 2 | -14/+14 |
|\ | | | | | | | | | Conflicts: actionpack/lib/action_dispatch/routing/redirection.rb | ||||
| * | Fix another AS::Concern example (class_eval is already called by included) | maximerety | 2012-11-15 | 1 | -4/+2 |
| | | |||||
| * | Fix AS::Concern example (current example doesn't work) | maximerety | 2012-11-15 | 1 | -1/+3 |
| | | |||||
| * | 1.9 hash syntax in activesupport | AvnerCohen | 2012-11-10 | 1 | -9/+9 |
| | | |||||
* | | Simplify (and optimize) | Marc-Andre Lafortune | 2012-11-16 | 1 | -3/+3 |
| | | |||||
* | | Use Integer#div instead of Integer#/ to avoid side effects from mathn | Marc-Andre Lafortune | 2012-11-16 | 2 | -1/+9 |
| | | |||||
* | | Add docs for CachingKeyGenerator | Santiago Pastorino | 2012-11-15 | 1 | -0/+6 |
| | | |||||
* | | Add nodoc to DummyKeyGenerator since it's a private thing | Santiago Pastorino | 2012-11-15 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #8112 from rails/encrypted_cookies | Santiago Pastorino | 2012-11-15 | 3 | -3/+54 |
|\ \ | | | | | | | Encrypted cookies | ||||
| * | | Rename secret_token_key to secret_key_base | Santiago Pastorino | 2012-11-03 | 1 | -1/+1 |
| | | | |||||
| * | | Move ensure_secret_secure to DummyKeyGenerator | Santiago Pastorino | 2012-11-03 | 1 | -0/+24 |
| | | | |||||
| * | | Cache generated keys per KeyGenerator instance using salt + key_size | Santiago Pastorino | 2012-11-03 | 1 | -0/+14 |
| | | | |||||
| * | | Add cookie.encrypted which returns an EncryptedCookieJar | Santiago Pastorino | 2012-11-03 | 2 | -3/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | How to use it? cookies.encrypted[:discount] = 45 => Set-Cookie: discount=ZS9ZZ1R4cG1pcUJ1bm80anhQang3dz09LS1mbDZDSU5scGdOT3ltQ2dTdlhSdWpRPT0%3D--ab54663c9f4e3bc340c790d6d2b71e92f5b60315; path=/ cookies.encrypted[:discount] => 45 | ||||
| * | | Sign cookies using key deriver | Santiago Pastorino | 2012-11-03 | 1 | -0/+10 |
| |/ | |||||
* | | Merge pull request #8219 from nikitug/threadsafe_xmlmini_with_backend | Rafael Mendonça França | 2012-11-15 | 3 | -9/+104 |
|\ \ | | | | | | | | | | | | | | | | | | | Make XmlMini.with_backend usable with threads Conflicts: activesupport/CHANGELOG.md | ||||
| * | | Make XmlMini.with_backend usable with threads | Nikita Afanasenko | 2012-11-15 | 3 | -9/+104 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `XmlMini.with_backend` now may be safely used with threads: Thread.new do XmlMini.with_backend("REXML") { rexml_power } end Thread.new do XmlMini.with_backend("LibXML") { libxml_power } end Each thread will use it's own backend. | ||||
* | | | let remove_constant still delete Kernel#autoload constants [rounds #8213] | Xavier Noria | 2012-11-15 | 3 | -13/+25 |
|/ / | | | | | | | | | The method #remove_const does not load the file, so we can still remove the constant. | ||||
* | | dependencies no longer trigger Kernel#autoload in remove_const [fixes #8213] | Xavier Noria | 2012-11-15 | 4 | -13/+44 |
| | | |||||
* | | backporting Struct#to_h from ruby 2.0 | Aaron Patterson | 2012-11-13 | 2 | -0/+16 |
| | | |||||
* | | Use new mocha version and add changelog entry for #8180 | Carlos Antonio da Silva | 2012-11-13 | 1 | -0/+2 |
| | | |||||
* | | Merge pull request #8180 from freerange/mocha-fixes-supporting-only-0.13-onwards | Carlos Antonio da Silva | 2012-11-13 | 2 | -25/+5 |
|\ \ | | | | | | | Simplify code by taking advantage of latest mocha (v0.13.0). | ||||
| * | | Simplify code by taking advantage of latest mocha (v0.13.0). | James Mead | 2012-11-12 | 2 | -25/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This only works with mocha v0.13.0 or later. Note that this also fixes a few subtle bugs present in the current implementation :- * Mocha was raising a `MiniTest::Assertion` instead of a `Mocha::ExpectationError` as intended. The latter is not recognized by MiniTest as an assertion failure and so it is recorded as a test *error*, not a test *failure* as it ought to. This leads to potentially confusing output in the test results. * Mocha verification should happen as part of the test. The verification of expectations is equivalent to a set of assertions. These assertions should happen as *part of* the test so that they have a chance to cause the test to fail, and not just as part of the teardown. Also if an assertion fails during the test, then there is no need to verify expectations, because only the first assertion failure is normally reported and all subsequent bets are off. * Expectation verification should be counted as an assertion. Mocha cannot record each expectation verification as an assertion, because we weren't passing in an assertion counter to `#mocha_verify`. | ||||
* | | | `#as_json` isolates options when encoding a hash. Closes #8182 | Yves Senn | 2012-11-12 | 3 | -1/+24 |
|/ / | | | | | | | | | | | Setting options in a custom `#as_json` method had side effects. Modifications of the `options` hash leaked outside and influenced the conversion of other objects contained in the hash. | ||||
* | | Merge pull request #8173 from nikitug/match_classes_without_to_s | Carlos Antonio da Silva | 2012-11-11 | 1 | -10/+10 |
|\ \ | | | | | | | Match classes without to_s conversions. | ||||
| * | | Match classes without to_s conversions. | Nikita Afanasenko | 2012-11-11 | 1 | -10/+10 |
| | | | | | | | | | | | | There is no need in `value_under_case.class.to_s` conversion since case already matches classes with `Class === value_under_case`. | ||||
* | | | Test Hash#diff deprecation, also prevent deprecation message in AS tests | Nikita Afanasenko | 2012-11-11 | 1 | -1/+3 |
|/ / | |||||
* | | Deprecate Hash#diff. | Steve Klabnik | 2012-11-09 | 2 | -0/+4 |
| | | | | | | | | | | | | It's no longer used in Rails any more. See https://github.com/rails/rails/pull/8142\#issuecomment-10227297 for more | ||||
* | | Merge pull request #7763 from route/full-capture | Carlos Antonio da Silva | 2012-11-08 | 3 | -11/+29 |
|\ \ | | | | | | | Kernel#capture replaced by version which can catch output from subprocesses | ||||
| * | | Kernel#capture replaced by version which can catch output from subprocesses | Dmitry Vorotilin | 2012-11-01 | 3 | -11/+29 |
| | | | |||||
* | | | Clean up gemspecs | Vinny Diehl | 2012-11-08 | 1 | -9/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Organized the gemspec files a bit. * Made quotes more consistent (single quotes dominated, so I used that). * Moved license line down a line, separating it logically, and removed the extra whitespace before its = operator. * Minor whitespace fixes. | ||||
* | | | cleaning up constantize tests | Aaron Patterson | 2012-11-07 | 1 | -44/+44 |
| | | | |||||
* | | | fix warnings in Ruby 2.0 | Aaron Patterson | 2012-11-07 | 2 | -0/+4 |
| | | | |||||
* | | | mocha_standalone is now deprecated. Switch to mocha/api. | Jeremy Kemper | 2012-11-05 | 1 | -1/+1 |
| | | | |||||
* | | | Make the tests pass with minitest 4.2 | Rafael Mendonça França | 2012-11-05 | 1 | -0/+3 |
| | | | |||||
* | | | Remove AS::Concern extension from Testing::TaggedLogging | Carlos Antonio da Silva | 2012-11-05 | 1 | -4/+0 |
| | | | |||||
* | | | Refactor Inflector#ordinal to avoid converting the number twice | Carlos Antonio da Silva | 2012-11-04 | 1 | -2/+4 |
| | | | |||||
* | | | Fix typo in test name | Carlos Antonio da Silva | 2012-11-04 | 2 | -3/+2 |
| | | | |||||
* | | | Use `tag!` instead of `method_missing` in `to_xml` conversions. | Nikita Afanasenko | 2012-11-04 | 3 | -5/+9 |
| |/ |/| | | | | | Since version `3.0.x` `Builder` caches method passed to `method_missing` each time. This commit replaces `method_missing` call with `tag!` call to prevent method redefinition on each `to_xml` call with the same builder. | ||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-11-03 | 4 | -9/+9 |
|\ \ | | | | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/metal/mime_responds.rb activerecord/lib/active_record/attribute_methods.rb guides/source/working_with_javascript_in_rails.md | ||||
| * | | Adding a missing parenthesis in the doc of String#parameterize. | Geoffrey Roguelon | 2012-10-24 | 1 | -2/+2 |
| | | | |||||
| * | | fix output messages - docs [ci skip] | Francesco Rodriguez | 2012-10-22 | 4 | -6/+6 |
| | | | |||||
| * | | More changes around 1.9 hash syntax | AvnerCohen | 2012-10-21 | 2 | -4/+4 |
| | | | | | | | | | | | | Added missing space in previous hash related commit | ||||
* | | | Fixed timezone mapping of Solomon Islands. | Steve Klabnik | 2012-11-01 | 2 | -1/+3 |
| |/ |/| | | | | | | | | | | | | | Fixes #8095. For reference, here is the discussion about the mapping being incorrect: http://rubyforge.org/pipermail/tzinfo-users/2012-November/000114.html | ||||
* | | Make caller attribute in deprecation methods optional | Alexey Gaziev | 2012-10-30 | 13 | -15/+23 |
| | |