Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #6362 from bogdan/callbacks_simplify_statement | José Valim | 2012-05-17 | 1 | -2/+2 |
|\ | | | | | AS::Callbacks: simplify logical statement | ||||
| * | AS::Callbacks: simplify logical statement | Bogdan Gusiev | 2012-05-17 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #6361 from markmcspadden/issue_6265 | José Valim | 2012-05-17 | 1 | -24/+0 |
|\ \ | | | | | | | Remove special cases for duplicable? on Class and Module | ||||
| * | | Remove special cases for duplicable? on Class and Module | Mark McSpadden | 2012-05-17 | 1 | -24/+0 |
| | | | |||||
* | | | Ensure blocks given to subscriber are properly yield | José Valim | 2012-05-17 | 1 | -4/+5 |
| | | | |||||
* | | | Merge pull request #6356 from andhapp/fix-bug-with-inflections | José Valim | 2012-05-16 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | Fix an issue with inflection | ||||
| * | | Fix an issue with inflection where my_analyses (in plular form) incorrectly ↵ | Anuj Dutta | 2012-05-16 | 1 | -1/+1 |
| | | | | | | | | | | | | converted to my_analyasis(in singular form). | ||||
* | | | Fixed logger bug introduced by #2237 | Brian Cardarella | 2012-05-17 | 1 | -0/+3 |
|/ / | |||||
* | | Revert "Merge pull request #6354 from lest/patch-1" | Carlos Galdino + Rafael Mendonça França | 2012-05-16 | 3 | -1/+5 |
| | | | | | | | | | | | | | | This reverts commit e8feaff60b9c04d34ad234f7d17b5d2ad9cc7a24, reversing changes made to 9adf28c026070afb78b80027521a4ddddd68d697. Reason: This broke the actionmailer tests | ||||
* | | Merge pull request #6354 from lest/patch-1 | Rafael Mendonça França | 2012-05-16 | 3 | -5/+1 |
|\ \ | | | | | | | remove unnecessary require | ||||
| * | | remove unnecessary require | Sergey Nartimov | 2012-05-16 | 3 | -5/+1 |
| | | | | | | | | | | | | | | | - access & filters don't use multibyte ext - transliterate requires only AS::Multibyte but not multibyte ext | ||||
* | | | fix bad formatting [ci skip] | Vijay Dev | 2012-05-17 | 1 | -2/+2 |
|/ / | |||||
* / | fix safe string interpolation with SafeBuffer#%, closes #6352 | Vasiliy Ermolovich | 2012-05-16 | 1 | -0/+14 |
|/ | |||||
* | remove backported string interpolation | Vasiliy Ermolovich | 2012-05-15 | 2 | -3/+0 |
| | |||||
* | Merge pull request #5571 from jarkko/5559-fix-dst-jump-bug-on-master | Aaron Patterson | 2012-05-15 | 1 | -0/+5 |
|\ | | | | | [#5559] Do not black out the system timezone DST jump hour if Time.zone ... | ||||
| * | [#5559] Do not black out the system timezone DST jump hour if Time.zone ↵ | Jarkko Laine | 2012-03-24 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | differs from that. The system timezone DST jump hour should not be blacked out by Time.zone.parse if current Time.zone does not do the jump at that time. Fixes #5559. | ||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-05-15 | 25 | -82/+52 |
|\ \ | | | | | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/asset_tag_helper.rb | ||||
| * | | missing dot [ci skip] | Vijay Dev | 2012-05-15 | 1 | -1/+1 |
| | | | |||||
| * | | adding examples to deep_dup method | Francesco Rodriguez | 2012-05-14 | 1 | -1/+23 |
| | | | |||||
| * | | removing unnecessary 'examples' noise from activesupport | Francesco Rodriguez | 2012-05-13 | 21 | -74/+11 |
| | | | |||||
| * | | Fixing Hash#stringify_keys docs | Francesco Rodriguez | 2012-05-13 | 1 | -1/+1 |
| | | | |||||
| * | | marking self in Hash#symbolize_keys! | Francesco Rodriguez | 2012-05-13 | 1 | -1/+1 |
| | | | |||||
| * | | added example to Hash#symbolize_keys | Francesco Rodriguez | 2012-05-13 | 1 | -2/+5 |
| | | | |||||
| * | | unnecessary 'examples' noise in Hash#assert_valid_keys docs | Francesco Rodriguez | 2012-05-13 | 1 | -1/+0 |
| | | | |||||
| * | | added example to Hash#stringify_keys | Francesco Rodriguez | 2012-05-13 | 1 | -1/+5 |
| | | | |||||
| * | | adding examples to Hash#deep_merge method | Francesco Rodriguez | 2012-05-13 | 1 | -2/+7 |
| | | | |||||
| * | | Update docs to public_send for Object#try | Oscar Del Ben | 2012-05-13 | 1 | -1/+1 |
| | | | |||||
| * | | update docs on Object#try | Vasiliy Ermolovich | 2012-05-13 | 1 | -1/+1 |
| | | | |||||
* | | | Since escape_html_entities_in_json was moved to 3-2-stable, make it true in ↵ | José Valim | 2012-05-14 | 1 | -1/+1 |
| | | | | | | | | | | | | AS, closes #6287 | ||||
* | | | Merge pull request #4431 from lest/refactor-1-9 | Rafael Mendonça França | 2012-05-13 | 1 | -7/+3 |
|\ \ \ | | | | | | | | | use const_defined? with second argument in AS::Dependencies | ||||
| * | | | use const_defined? with second argument in AS::Dependencies | Sergey Nartimov | 2012-05-13 | 1 | -7/+3 |
| | | | | | | | | | | | | | | | | there is no need in local_const_defined? helper method | ||||
* | | | | Remove dependency on safe_join from number helpers | Carlos Antonio da Silva | 2012-05-13 | 1 | -3/+2 |
| | | | | | | | | | | | | | | | | Introduced in 0f848dd54911f0e15c5c3aceabf09582cc6eab16. | ||||
* | | | | Merge pull request #6305 from arunagw/ruby-prof-fixes | Carlos Antonio da Silva | 2012-05-13 | 2 | -1/+2 |
|\ \ \ \ | |/ / / |/| | | | Ruby prof fixes | ||||
| * | | | Need to include "OutputSaftyHelper" here to prevent | Arun Agrawal | 2012-05-13 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | `number_with_delimiter': undefined method `safe_join' for #<ActiveSupport::Testing::Performance::Metrics::Objects | ||||
| * | | | Fixed ruby-prof changes and let's use latest ruby-prof now. | Arun Agrawal | 2012-05-13 | 1 | -1/+1 |
| | | | | |||||
* | | | | Remove blockless_step leave all that up to Ruby | Santiago Pastorino | 2012-05-13 | 2 | -14/+0 |
|/ / / | | | | | | | | | | Closes #6297 | ||||
* / / | Move AS set configs to AS Raitie | Santiago Pastorino | 2012-05-12 | 1 | -0/+7 |
|/ / | |||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-05-12 | 9 | -21/+93 |
|\ \ | | | | | | | | | | | | | Conflicts: activesupport/lib/active_support/callbacks.rb | ||||
| * | | fix incorrect example [ci skip] | Vijay Dev | 2012-05-12 | 1 | -1/+1 |
| | | | |||||
| * | | remove docs related to ruby 1.8 from Array#wrap | Vasiliy Ermolovich | 2012-05-12 | 1 | -3/+0 |
| | | | |||||
| * | | added examples to Integer#multiple_of? | Francesco Rodriguez | 2012-05-11 | 1 | -0/+4 |
| | | | |||||
| * | | removing trailing spaces | Francesco Rodriguez | 2012-05-11 | 1 | -3/+3 |
| | | | |||||
| * | | added docs to String#to_datetime | Francesco Rodriguez | 2012-05-11 | 1 | -0/+6 |
| | | | |||||
| * | | added docs to String#to_date | Francesco Rodriguez | 2012-05-11 | 1 | -0/+6 |
| | | | |||||
| * | | added examples to String#exclude? | Francesco Rodriguez | 2012-05-11 | 1 | -1/+6 |
| | | | |||||
| * | | remove unnecessary 'examples' noise | Francesco Rodriguez | 2012-05-11 | 3 | -9/+0 |
| | | | |||||
| * | | fix String#last example | Francesco Rodriguez | 2012-05-11 | 1 | -1/+1 |
| | | | |||||
| * | | fix String#last example | Francesco Rodriguez | 2012-05-11 | 1 | -1/+1 |
| | | | |||||
| * | | added docs to String#last | Francesco Rodriguez | 2012-05-11 | 1 | -0/+10 |
| | | | |||||
| * | | improve String#first docs | Francesco Rodriguez | 2012-05-11 | 1 | -4/+3 |
| | | |