Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "It should be possible to use ActiveSupport::DescendantTracker ↵ | José Valim | 2011-03-13 | 1 | -9/+7 |
| | | | | | | | | without getting ActiveSupport::Dependencies for free." This reverts commit 46f6a2e3889bae420589f429b09722a37dbdf18d. Caused failures on CI. rake test:isolated on activesupport directory show them. | ||||
* | Prevent callbacks in child classes from being executed more than once. | Rolf Timmermans | 2011-03-13 | 2 | -1/+31 |
| | |||||
* | It should be possible to use ActiveSupport::DescendantTracker without ↵ | Rolf Timmermans | 2011-03-13 | 1 | -7/+9 |
| | | | | getting ActiveSupport::Dependencies for free. | ||||
* | adds a couple of missing AS dependencies | Rolf Timmermans | 2011-03-12 | 2 | -0/+3 |
| | |||||
* | Add missing require 'thread' to BufferedLogger. | José Valim | 2011-03-11 | 1 | -0/+1 |
| | |||||
* | move the conditional definition of Float#round down | Xavier Noria | 2011-03-09 | 2 | -2/+2 |
| | | | | | | | Rails 3 cherry-picks as little as possible from Active Support. In particular the framework requires the files where extensions are exactly defined, rather than convenience entry points like float.rb and friends. Because of that, it is better to define conditionally rather than require conditionally. | ||||
* | Use Rubys own Float#round method in versions 1.9 and above | Andrei Kulakov | 2011-03-10 | 1 | -1/+1 |
| | |||||
* | Add better test scenario for around callback return results | Aaron Pfeifer | 2011-03-08 | 1 | -0/+10 |
| | |||||
* | Allow access to a callback event's return result from around callbacks | Aaron Pfeifer | 2011-03-08 | 2 | -2/+32 |
| | |||||
* | removing stubs. 1.9.3 implements Date.today in C so mocking the return value ↵ | Aaron Patterson | 2011-03-07 | 1 | -9/+4 |
| | | | | of Time.now does nothing | ||||
* | fixing some tests on ruby 1.9.3 | Aaron Patterson | 2011-03-07 | 1 | -0/+23 |
| | |||||
* | reorganizes the RDoc of Hash#to_param | Xavier Noria | 2011-03-07 | 1 | -6/+14 |
| | |||||
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-03-07 | 4 | -8/+7 |
|\ | |||||
| * | Improved docs for Hash#to_param method | Dalibor Nasevic | 2011-03-06 | 1 | -3/+2 |
| | | |||||
| * | more "SSL everywhere" for GitHub URLs | Akira Matsuda | 2011-03-07 | 2 | -4/+4 |
| | | | | | | | | see: https://github.com/blog/738-sidejack-prevention-phase-2-ssl-everywhere | ||||
| * | "SSL everywhere" for GitHub URLs | Akira Matsuda | 2011-03-07 | 1 | -1/+1 |
| | | | | | | | | see: https://github.com/blog/738-sidejack-prevention-phase-2-ssl-everywhere | ||||
* | | do not test explicit equality of predicate methods, they should be allowed ↵ | Aaron Patterson | 2011-03-07 | 2 | -8/+4 |
| | | | | | | | | to return truthy or falsey objects | ||||
* | | refactor calls to to_param in expand_key method | Aaron Patterson | 2011-03-07 | 1 | -9/+10 |
| | | |||||
* | | Merge branch 'master' of github.com:rails/rails | Aaron Patterson | 2011-03-07 | 9 | -14/+16 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of github.com:rails/rails: (44 commits) Fixed indentation in actionmailer base_test [#6538 state:committed] remove unused assigned variable removes merge conflicts removes Examples headers introduced in 9b96de6 Revert "Fixed identation in actionmailer base_test" Report the correct value of nil.id in the exception message as different ruby implementations may have different values, for example Rubinius returns 53 for nil.id. Improve testing of cookies in functional tests: - cookies can be set using string or symbol keys - cookies are preserved across calls to get, post, etc. - cookie names and values are escaped - cookies can be cleared using @request.cookies.clear more style changes Some style changes style changes Revert "style changes" Raise ArgumentError if route name is invalid [#6517 state:resolved] style changes Allow model to be inherited from Hash [#6487 state:resolved] styles applied for usage added failing test for fields_for with a record object that inherits from Hash Fixed identation in actionmailer base_test wrong SQL statement commas to set off expressions that interrupt sentence flow typo changes ... | ||||
| * | removes merge conflicts | Xavier Noria | 2011-03-06 | 2 | -15/+0 |
| | | |||||
| * | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-03-06 | 9 | -13/+28 |
| |\ | |||||
| | * | removes Examples headers introduced in 9b96de6 | Xavier Noria | 2011-03-06 | 1 | -10/+4 |
| | | | | | | | | | | | | | | | | | | | | | Example headers are discouraged in the API guidelines. Code just flows with the text. They may be good in places where there's a lot of stuff and structure may add clarity | ||||
| | * | more style changes | suchasurge | 2011-03-06 | 2 | -2/+2 |
| | | | |||||
| | * | Some style changes | suchasurge | 2011-03-06 | 5 | -5/+11 |
| | | | |||||
| | * | merges rails | Xavier Noria | 2011-03-05 | 23 | -124/+305 |
| | |\ | |||||
| | * | | Active Support typos. | R.T. Lechow | 2011-03-04 | 7 | -7/+7 |
| | | | | |||||
| | * | | Adds link to Object.blank? from Object.present? | Jonathon D. Jones | 2011-03-03 | 1 | -1/+1 |
| | | | | |||||
| | * | | Fix incorrect example. | Ben Orenstein | 2011-02-27 | 1 | -2/+2 |
| | | | | |||||
| | * | | Fix incorrect word. | Ben Orenstein | 2011-02-27 | 1 | -1/+1 |
| | | | | |||||
| | * | | Clarify comment by removing french reference ('a la'). Should improve ↵ | Ben Orenstein | 2011-02-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | readability for non-native english speakers. | ||||
| | * | | Example descriptions and their examples were flipped. Fix. | Ben Orenstein | 2011-02-26 | 1 | -3/+3 |
| | | | | |||||
| | * | | Correct example that did not do what it claimed. Rework explanation. | Ben Orenstein | 2011-02-26 | 1 | -5/+5 |
| | | | | |||||
| * | | | Report the correct value of nil.id in the exception message | Andrew White | 2011-03-06 | 2 | -1/+3 |
| | |/ | |/| | | | | | | | | | | | | | | | | as different ruby implementations may have different values, for example Rubinius returns 53 for nil.id. [#6444 state:resolved] | ||||
* / | | use sort_by instead of sort() | Aaron Patterson | 2011-03-05 | 1 | -1/+1 |
|/ / | |||||
* | | revises the RDoc of Hash#reverse_merge | Xavier Noria | 2011-03-05 | 1 | -13/+7 |
| | | |||||
* | | copy-edits 108561f | Xavier Noria | 2011-03-05 | 1 | -1/+1 |
| | | |||||
* | | Active Support typos. | R.T. Lechow | 2011-03-05 | 7 | -7/+7 |
| | | |||||
* | | Adds link to Object.blank? from Object.present? | Jonathon D. Jones | 2011-03-05 | 1 | -1/+1 |
| | | |||||
* | | Fix incorrect example. | Ben Orenstein | 2011-03-05 | 1 | -2/+2 |
| | | |||||
* | | Fix incorrect word. | Ben Orenstein | 2011-03-05 | 1 | -1/+1 |
| | | |||||
* | | Clarify comment by removing french reference ('a la'). Should improve ↵ | Ben Orenstein | 2011-03-05 | 1 | -1/+1 |
| | | | | | | | | readability for non-native english speakers. | ||||
* | | Example descriptions and their examples were flipped. Fix. | Ben Orenstein | 2011-03-05 | 1 | -3/+3 |
| | | |||||
* | | Correct example that did not do what it claimed. Rework explanation. | Ben Orenstein | 2011-03-05 | 1 | -5/+5 |
| | | |||||
* | | reverted tests deleted by 080345baca1076a9788d, refactored implementations ↵ | Diego Carrion | 2011-03-04 | 1 | -3/+13 |
| | | | | | | | | | | | | should not invalidate the validations Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | | refactored Time#<=> and DateTime#<=> by removing unnecessary calls without ↵ | Diego Carrion | 2011-03-04 | 3 | -20/+5 |
| | | | | | | | | | | | | losing performance Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | | remove to_s implementation so that inspect is helpful | Aaron Patterson | 2011-03-02 | 1 | -1/+0 |
| | | |||||
* | | * LocalCache strategy is now a real middleware class, not an anonymous class | Aaron Patterson | 2011-03-02 | 2 | -23/+32 |
| | | | | | | | | posing for pictures. | ||||
* | | require deprecation so that we can deprecate methods! | Aaron Patterson | 2011-03-02 | 1 | -0/+1 |
| | | |||||
* | | anonymous classes have blank names on ruby 1.8 | Aaron Patterson | 2011-03-02 | 1 | -1/+1 |
| | | |||||
* | | adding deprecation noticies to deprecated class cache methods | Aaron Patterson | 2011-03-02 | 3 | -7/+41 |
| | |