Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-09-21 | 1 | -15/+17 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: actionmailer/lib/action_mailer/base.rb activesupport/lib/active_support/configurable.rb activesupport/lib/active_support/core_ext/module/deprecation.rb guides/source/action_controller_overview.md guides/source/active_support_core_extensions.md guides/source/ajax_on_rails.textile guides/source/association_basics.textile guides/source/upgrading_ruby_on_rails.md While resolving conflicts, I have chosen to ignore changes done in docrails at some places - these will be most likely 1.9 hash syntax changes. | ||||
| * | update AS docs [ci skip] | Francesco Rodriguez | 2012-09-17 | 1 | -15/+17 |
| | | |||||
* | | Deprecate ActiveSupport::Benchmarkable#silence. | Steve Klabnik | 2012-09-15 | 1 | -0/+1 |
|/ | | | | | | | Due to its lack of thread safety, we're deprecating this, and it will be removed in Rails 4.1. Fixes #4060. | ||||
* | logger.silence is deprecated | jlxw | 2012-02-27 | 1 | -1/+1 |
| | |||||
* | general formatting cleanup, and clarify that passing true as third option ↵ | Matt Jankowski | 2011-07-01 | 1 | -11/+11 |
| | | | | for benchmarking will stop output OTHER THAN the timing output itself | ||||
* | Removed deprecated methods and related tests from ActiveSupport | Josh Kalderimis | 2011-05-25 | 1 | -7/+2 |
| | |||||
* | Remove extra white spaces on ActiveSupport docs. | Sebastian Martinez | 2011-05-23 | 1 | -1/+1 |
| | |||||
* | Deletes trailing whitespaces (over text files only find * -type f -exec sed ↵ | Santiago Pastorino | 2010-08-14 | 1 | -3/+3 |
| | | | | 's/[ \t]*$//' -i {} \;) | ||||
* | requires active_support/core_ext/hash/keys in benchmarkable because it uses ↵ | Xavier Noria | 2010-01-01 | 1 | -0/+1 |
| | | | | assert_valid_keys | ||||
* | Unify benchmark APIs. | José Valim | 2009-10-15 | 1 | -0/+59 |