Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "Omit directories from gemspec.files for RubyGems 2 compat." | Jeremy Kemper | 2012-12-09 | 1 | -1/+1 |
| | | | | | | Obviated by rubygems/rubygems@486ed83cc8e706069213c5d406122f4cfcca9e7f This reverts commit bb8923dee093b615615cdfb83b34d1b0bb254f25. | ||||
* | Omit directories from gemspec.files for RubyGems 2 compat. | Jeremy Kemper | 2012-12-08 | 1 | -1/+1 |
| | | | | | | RG2 packager expects each spec.files path to be a file and bombs when it tries to tarball a dir. May revert if rubygems/rubygems#413 is accepted. | ||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-12-08 | 1 | -1/+1 |
|\ | |||||
| * | Update activesupport/lib/active_support/deprecation/proxy_wrappers.rb | Claudio B. | 2012-12-07 | 1 | -1/+1 |
| | | | | | | Fix a typo in rdoc (*expect* for *except*) | ||||
* | | Rename ActiveSupport::BasicObject to ActiveSupport::ProxyObject | Francesco Rodriguez | 2012-12-07 | 6 | -15/+29 |
| | | | | | | | | | | AS::BasicObject is used for proxy classes. Let's give it a less concerning name. Also, it avoids the confusion with Ruby's Basic Object. | ||||
* | | Add comment about implementation of class_attribute | Andrew White | 2012-12-06 | 1 | -0/+3 |
| | | | | | | | | | | | | | | To prevent future pull requests like #8435 add a comment about the implementation of class_attribute using class_eval for performance. [ci skip] | ||||
* | | silence warning: possibly useless use of a constant in void context | kennyj | 2012-12-06 | 1 | -3/+7 |
| | | |||||
* | | Replace comments' non-breaking spaces with spaces | claudiob | 2012-12-04 | 17 | -32/+32 |
|/ | | | | | | | | | | Sometimes, on Mac OS X, programmers accidentally press Option+Space rather than just Space and don’t see the difference. The problem is that Option+Space writes a non-breaking space (0XA0) rather than a normal space (0x20). This commit removes all the non-breaking spaces inadvertently introduced in the comments of the code. | ||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-12-04 | 3 | -3/+16 |
|\ | | | | | | | | | Conflicts: guides/source/migrations.md | ||||
| * | nodoc AS::Testing::ConstantLookup::ClassMethods [ci skip] | Carlos Duclos | 2012-12-01 | 1 | -1/+1 |
| | | |||||
| * | Add documentation for Hash.from_xml [ci skip] | HPNeo | 2012-12-01 | 1 | -0/+13 |
| | | |||||
| * | Revert "Remove trailing whitespaces" | Florent Guilleux | 2012-12-01 | 11 | -31/+33 |
| | | | | | | | | This reverts commit 90c887fa7d0c454b7533e208daefc342dea4d5f3. | ||||
| * | Remove trailing whitespaces | Florent Guilleux | 2012-12-01 | 11 | -33/+31 |
| | | |||||
| * | nodoc AS::Testing::Pending because is deprecated [ci skip] | Carlos Duclos | 2012-12-01 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #8393 from frodsan/fix_dependend_order_test_example | Carlos Antonio da Silva | 2012-12-03 | 1 | -0/+3 |
|\ \ | | | | | | | Ensure original encoding does not change in mb_chars test. | ||||
| * | | ensure original encoding doesnt change | Francesco Rodriguez | 2012-12-01 | 1 | -0/+3 |
| |/ | |||||
* | | Use send in Time marshal extensions since the methods are now private | Carlos Antonio da Silva | 2012-12-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | See https://github.com/ruby/ruby/commit/9c1b3161f20162dc1682d758c0e4d2fc3a74745e All Active Support tests pass in 2.0.0preview2 after this change. Closes #8409 | ||||
* | | Only take the date parts from Time.zone.now | Andrew White | 2012-12-01 | 2 | -3/+10 |
|/ | | | | | | | When there are missing components in the Hash returned by Date._parse only the date components should default to the value of Time.zone.now, the time components should all default to zero. | ||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-12-01 | 1 | -3/+3 |
|\ | | | | | | | | | Conflicts: guides/source/active_record_validations.md | ||||
| * | nodoc AS::Deprecation::InstanceDelegator class [ci skip] | Francesco Rodriguez | 2012-11-29 | 1 | -3/+3 |
| | | |||||
* | | Patched Marshal#load to work with constant autoloading ↵ | Uriel Katz | 2012-12-01 | 8 | -19/+223 |
| | | | | | | | | (active_support/dependecies.rb) (issue #8167) | ||||
* | | Make `Time.zone.parse` to work with JavaScript date strings | Andrew White | 2012-12-01 | 3 | -25/+36 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Chrome, Safari and Firefox serialize Date objects to strings such as 'Mon May 28 2012 00:00:00 GMT-0700 (PDT)'. When these strings are parsed the zone is interpreted as 'GMT-0700' which doesn't exist in the TzInfo list of timezones. By taking advantage of the improved date/time handling in 1.9.3 we can use `Date._parse` and the `:offset` value which is parsed correctly. Three tests were amended to make them pass: 1. test_parse_with_old_date This needed changing to a different value because the original value was before EST was adopted so was being changed to a LMT (Local Mean Time) value after the change. It didn't before because `DateTime` just has offsets from UTC not timezones. 2. test_parse_should_not_black_out_system_timezone_dst_jump Changed the implementation of this test as the stubs were dependent on internal implementation details of the test. Confirmed that the modified test still failed when the implementation of `parse` was restored to pre-#5571. 3. test_parse_should_black_out_app_timezone_dst_jump Ditto. Closes #5770. | ||||
* | | Add #seconds_until_end_of_day to DateTime and Time | Olek Janiszewski | 2012-11-29 | 5 | -1/+84 |
| | | |||||
* | | 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). |