Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "Merge pull request #12480 from iwiznia/master" | Jeremy Kemper | 2013-10-11 | 3 | -42/+0 |
| | | | | | This reverts commit e5f5a838b96a362534d9bb60d02334439ed9784c, reversing changes made to d7567f3290a50952494e9213556a1f283a6cf3a0. | ||||
* | flatten and flatten! methods for ActiveSupport::Duration | Ionatan Wiznia | 2013-10-11 | 3 | -0/+42 |
| | |||||
* | revises the docs of require_dependency [ci skip] | Xavier Noria | 2013-10-01 | 1 | -1/+9 |
| | |||||
* | registers 0b0beb7 in the CHANGELOG [ci skip] | Xavier Noria | 2013-10-01 | 1 | -0/+5 |
| | |||||
* | Merge pull request #12412 from bf4/allow_pathname_for_require_dependency | Xavier Noria | 2013-09-30 | 2 | -1/+14 |
|\ | | | | | Allow Pathname for require dependency | ||||
| * | require_dependency should allow Pathname-like objects, not just String | Benjamin Fleischer | 2013-09-30 | 2 | -1/+14 |
| | | |||||
* | | Fix small typo in docs | Jonathan Baudanza | 2013-09-25 | 1 | -1/+1 |
| | | |||||
* | | Fix typo in number_to_human docs: you -> your | Mac Martine | 2013-09-24 | 1 | -1/+1 |
| | | |||||
* | | Changelog entry for pr #11474 | Bogdan Gusiev | 2013-09-23 | 1 | -0/+5 |
| | | |||||
* | | Merge pull request #11474 from bogdan/time-with-zone-succ | Andrew White | 2013-09-22 | 3 | -0/+47 |
|\ \ | | | | | | | Prevent server blow up when iterating over TimeWithZone Range | ||||
| * | | Disable ability to iterate over a Range of TimeWithZone | Bogdan Gusiev | 2013-07-19 | 3 | -0/+47 |
| | | | |||||
* | | | Merge pull request #12285 from dasch/dasch/allow-attaching-up-front | José Valim | 2013-09-20 | 3 | -2/+92 |
|\ \ \ | | | | | | | | | Allow attaching to AS::Notifications namespace up front | ||||
| * | | | Allow attaching to AS::Notifications namespace up front | Daniel Schierbeck | 2013-09-20 | 3 | -2/+92 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before, you were required to attach *after* adding the methods to the class, since the attachment process needed the methods to be present. With this change, any new method will also be attached to the configured namespace. | ||||
* | | | | Initializing Codepoint object with default values | Hitendra Singh | 2013-09-20 | 2 | -6/+7 |
| | | | | |||||
* | | | | Drying up method_missing code | Hitendra Singh | 2013-09-20 | 1 | -2/+1 |
|/ / / | |||||
* | | | Add CHANGELOG entry for #10879 | Rafael Mendonça França | 2013-09-12 | 1 | -0/+6 |
| | | | | | | | | | | | | [ci skip] | ||||
* | | | Merge pull request #12196 from h-lame/fix-activesupport-cache-filestore-cleanup | Rafael Mendonça França | 2013-09-12 | 3 | -1/+18 |
|\ \ \ | | | | | | | | | Fix FileStore#cleanup to no longer rely on missing each_key method | ||||
| * | | | Fix FileStore#cleanup to no longer rely on missing each_key method | Murray Steele | 2013-09-11 | 3 | -1/+18 |
| | | | | |||||
* | | | | Enabled quirks mode on JSON.parse, fixes broken test in af9caae | Godfrey Chan | 2013-09-12 | 2 | -2/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | It turns out that ActionPack depends on the decoder to parse JSON "fragments" (e.g. '"a string"', '1', 'null', etc), so we need to enable quirks mode on JSON.parse. Also added coverage on the decoder side to prevent regression. | ||||
* | | | | Replace JSON.load with JSON.parse, also removed the proc parameter | Godfrey Chan | 2013-09-11 | 2 | -3/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we are dealing with untrusted user input, we should not be using JSON.load. According to the docs[1]: BEWARE: This method is meant to serialise data from trusted user input, like from your own database server or clients under your control, it could be dangerous to allow untrusted users to pass JSON sources into it. The default options for the parser can be changed via the ::load_default_options method. [1] http://www.ruby-doc.org/stdlib-2.0/libdoc/json/rdoc/JSON.html#method-i-load | ||||
* | | | | Merge pull request #12200 from dchelimsky/simplify-duration-inspect-even-more | Rafael Mendonça França | 2013-09-11 | 2 | -6/+7 |
|\ \ \ \ | |/ / / |/| | | | Reduce Duration#inspect to a single series of transformations | ||||
| * | | | Reduce Duration#inspect to a single series of transformations | David Chelimsky | 2013-09-11 | 2 | -6/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * eliminates need for temp Hash Also added a couple of examples to DurationTest to specify: * duration can be defined with units out of order e.g. 1.month + 1.year + 1.second + 1.day * equality with a Fixnum works regardless of which operand is on which side of the operator | ||||
* | | | | Be sure to restore the default I18n.locale after changed its value in a test | Akira Matsuda | 2013-09-10 | 1 | -3/+3 |
| | | | | |||||
* | | | | Fixes typo in Object#try! | Jay Hayes | 2013-09-10 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #12173 from arunagw/fixes_reverted_by_revert_commit | Guillermo Iguaran | 2013-09-10 | 1 | -2/+10 |
|\ \ \ \ | | | | | | | | | | | Revert fixes | ||||
| * | | | | Fix order dependent test | Arun Agrawal | 2013-09-09 | 1 | -2/+10 |
| | | | | | | | | | | | | | | | | | | | | see c48cbb02d7e6f585e31b404c0c363f0d6b586811 | ||||
* | | | | | Removed unused modules and classes | Anupam Choudhury | 2013-09-10 | 1 | -7/+0 |
| | | | | | |||||
* | | | | | Removed unnecessary require | Anupam Choudhury | 2013-09-10 | 1 | -1/+0 |
|/ / / / | |||||
* | | | | Fix typo in set_callback docs. [ci skip] | Gilad Zohari | 2013-09-06 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2013-08-31 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Fix doc for singularize - `pluralized` => `singularized` | Vipul A M | 2013-08-27 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Remove gist link from the code | Rafael Mendonça França | 2013-08-27 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is not good to include links in the code. These links can be in the future outdated and nobody will upgrade they. [ci skip] | ||||
* | | | | | Ensure all-caps nested consts marked as autoloaded | Simon Coffey | 2013-08-27 | 4 | -1/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, an autoloaded constant `HTML::SomeClass` would not be marked as autoloaded by AS::Dependencies. This is because the `#loadable_constants_for_path` method uses `String#camelize` on the inferred file path, which in turn means that, unless otherwise directed, AS::Dependencies watches for loaded constants in the `Html` namespace. By passing the original qualified constant name to `#load_or_require`, this inference step is avoided, and the new constant is picked up in the correct namespace. | ||||
* | | | | | Changing deprecation_horizon to be Rails 4.2 | wangjohn | 2013-08-24 | 1 | -1/+1 |
| |/ / / |/| | | | | | | | | | | | | | | | Also, +ActiveRecord::Migrator.proper_table_name+ should actually have a deprecation horizon of Rails 4.2 (not 4.1). | ||||
* | | | | Merge pull request #11932 from gaurish/skip-encoding-convertor | Rafael Mendonça França | 2013-08-21 | 2 | -0/+16 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [JRuby] Skip few of the ActiveSupport's inflector test cases Conflicts: activesupport/test/abstract_unit.rb | ||||
| * | | | | Define jruby_skip to skip test on JRuby | Gaurish Sharma | 2013-08-21 | 1 | -0/+5 |
| | | | | | |||||
| * | | | | Skip few of the ActiveSupport'sinflector test on JRuby | Gaurish Sharma | 2013-08-21 | 1 | -0/+10 |
| | | | | | |||||
* | | | | | Merge pull request #11850 from razielgn/mod-delegation-backtrace | Rafael Mendonça França | 2013-08-21 | 1 | -2/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Generalize backtrace check on DelegationError. | ||||
| * | | | | | Rely on NoMethodError#name when deciding to raise DelegationError. | Federico Ravasio | 2013-08-12 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Different Ruby implementations present backtraces differently, as it should be an information consumed by humans. A better implementation should use data from the error, in this case returned by NoMethodError#name. Fixes issues with Rubinius, which presents backtraces differently from MRI. | ||||
* | | | | | | Skip tests involving $SAFE, it's not supported on Rubinius. | Federico Ravasio | 2013-08-21 | 1 | -0/+2 |
| | | | | | | |||||
* | | | | | | Added method to skip tests on Rubinius to AS/abstract_unit. | Federico Ravasio | 2013-08-21 | 1 | -0/+4 |
| | | | | | | |||||
* | | | | | | ensure freeze on Thread freezes locals | Nick Howard | 2013-08-19 | 2 | -0/+14 |
| | | | | | | |||||
* | | | | | | oops, I missed this in 7193f75 | Guillermo Iguaran | 2013-08-18 | 1 | -1/+1 |
| |/ / / / |/| | | | | |||||
* | | | | | duration is called multiple times in dev, so lets cache it | Aaron Patterson | 2013-08-18 | 1 | -1/+2 |
| | | | | | |||||
* | | | | | Rename @locals to @_locals in Thread to avoid conflict with Rubinius. Closes ↵ | Guillermo Iguaran | 2013-08-18 | 1 | -7/+7 |
| |/ / / |/| | | | | | | | | | | | #11831 | ||||
* | | | | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2013-08-17 | 5 | -15/+8 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: actionview/README.rdoc activerecord/lib/active_record/migration.rb guides/source/development_dependencies_install.md guides/source/getting_started.md | ||||
| * | | | | Revert "Merge branch 'master' of github.com:rails/docrails" | Vijay Dev | 2013-08-17 | 5 | -15/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 70d6e16fbad75b89dd1798ed697e7732b8606fa3, reversing changes made to ea4db3bc078fb3093ecdddffdf4f2f4ff3e1e8f9. Seems to be a code merge done by mistake. | ||||
| * | | | | Revert "Removing obsolete html tags in favor of markdown code block" | Avner Cohen | 2013-08-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | This reverts commit 157dc275da0ad38635337b7c1d96de656d91de8e. | ||||
| * | | | | Removing obsolete html tags in favor of markdown code block. | Avner Cohen | 2013-08-06 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Fixed grammar error in ordered_options documention. | Dustin Lam | 2013-08-17 | 1 | -1/+1 |
| | | | | |