Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1608 from sishen/sishen | José Valim | 2011-07-11 | 1 | -0/+8 |
|\ | | | | | MemcacheStore: deserialize the entry reading from local_cache when using | ||||
| * | MemcacheStore: deserialize the entry reading from local_cache when using raw | Dingding Ye | 2011-06-10 | 1 | -0/+8 |
| | | |||||
* | | Merge pull request #1296 from c42engineering/issue636 | José Valim | 2011-07-11 | 1 | -1/+1 |
|\ \ | | | | | | | Resubmitting issue #636 as a pull request | ||||
| * | | Issue #636 - Parsing an xml file with multiple records and extra attributes ↵ | Sidu Ponnappa | 2011-07-11 | 1 | -1/+1 |
| | | | | | | | | | | | | (besides type) fails | ||||
* | | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-07-09 | 1 | -0/+2 |
|\ \ \ | |||||
| * | | | document HashWithIndifferentAccess#extractable_options? | Shawn Drost | 2011-07-07 | 1 | -0/+2 |
| | | | | |||||
* | | | | Properly cache value when it is "false" | Sebi Burkhard | 2011-07-08 | 1 | -2/+2 |
| | | | | |||||
* | | | | Merge pull request #1463 from psanford/master | Santiago Pastorino | 2011-07-06 | 1 | -2/+2 |
|\ \ \ \ | |/ / / |/| | | | Fix timezone handling in String.to_time | ||||
| * | | | Make String.to_time respect timezones | Nate Mueller | 2011-06-02 | 1 | -2/+2 |
| | | | | |||||
* | | | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-07-05 | 4 | -44/+46 |
|\ \ \ \ | |||||
| * | | | | minor edit in 7896ac3 | Vijay Dev | 2011-07-05 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | document meta methods | Vijay Dev | 2011-07-03 | 1 | -8/+8 |
| | | | | | |||||
| * | | | | general grammar cleanup of cache docs | Matt Jankowski | 2011-07-01 | 1 | -24/+26 |
| | | | | | |||||
| * | | | | 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 | ||||
| * | | | | correct error message for failed creation | Ray Baxter | 2011-06-26 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | all numerics should be html_safe - Closes #1935 | Damien Mathieu | 2011-07-03 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Master version is 3.2.0.beta | Santiago Pastorino | 2011-06-30 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Merge pull request #1690 from vijaydev/mattr_accessor_changes | José Valim | 2011-06-30 | 1 | -2/+6 |
|\ \ \ \ \ | | | | | | | | | | | | | Added instance_accessor: false to Module#mattr_accessor | ||||
| * | | | | | Added instance_accessor: false to Module#mattr_accessor | Vijay Dev | 2011-06-14 | 1 | -2/+6 |
| | | | | | | |||||
* | | | | | | Array.wrap should follow Kernel#Array semantics when the object's to_ary is ↵ | Jon Leighton | 2011-06-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | nil. In this case, the object should be wrapped. | ||||
* | | | | | | Fix configurable cristalization and tests. | José Valim | 2011-06-29 | 1 | -2/+2 |
| | | | | | | |||||
* | | | | | | OrderedOptions must implement respond_to? if it implements method_missing. | Chris Eppstein | 2011-06-27 | 1 | -0/+4 |
| | | | | | | |||||
* | | | | | | Merge pull request #1648 from dlee/acronyms | Xavier Noria | 2011-06-24 | 3 | -98/+153 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Inflector support for acronyms (Issue #1366) | ||||
| * | | | | | Add acronym support to Inflector; Issue #1366 | David Lee | 2011-06-11 | 2 | -10/+14 |
| | | | | | | |||||
| * | | | | | Refactor | David Lee | 2011-06-11 | 3 | -92/+143 |
| | | | | | | |||||
* | | | | | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-06-23 | 2 | -15/+20 |
|\ \ \ \ \ \ | |||||
| * | | | | | | grammar changes to log subscriber docs | Matt Jankowski | 2011-06-22 | 1 | -4/+4 |
| | | | | | | | |||||
| * | | | | | | move example code to be above reconfiguring discussion; add clarity about ↵ | Matt Jankowski | 2011-06-22 | 1 | -11/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | silencers and filters; misc grammar changes - for backtrace cleaners | ||||
* | | | | | | | Merge pull request #1750 from dmathieu/non_string_methods | Xavier Noria | 2011-06-22 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Calling unsafe methods which don't return a string shouldn't fail | ||||
| * | | | | | | | calling unsafe methods which don't return a string shouldn't fail | Damien Mathieu | 2011-06-22 | 1 | -2/+2 |
| | | | | | | | | |||||
* | | | | | | | | Ugh, the class_attribute pull request broke the build. fix it. | José Valim | 2011-06-19 | 1 | -7/+4 |
| | | | | | | | | |||||
* | | | | | | | | Add option to omit creating an instance reader method on class_attribute | James Miller | 2011-06-18 | 1 | -7/+20 |
| |/ / / / / / |/| | | | | | | |||||
* | | | | | | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-06-18 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | with -> will | Uģis Ozols | 2011-06-12 | 1 | -1/+1 |
| |/ / / / / | |||||
* | | | | | | safe_concat should not work on dirty buffers. | José Valim | 2011-06-16 | 1 | -4/+13 |
| | | | | | | |||||
* | | | | | | Fix safe buffer by adding a dirty status. | José Valim | 2011-06-16 | 1 | -12/+24 |
| | | | | | | |||||
* | | | | | | Update CHANGELOG, improve message. | José Valim | 2011-06-16 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Deprecate memoizable. | José Valim | 2011-06-15 | 1 | -0/+7 |
| | | | | | | |||||
* | | | | | | allow boolean last argument in memoized methods - Closes #1704 | Damien Mathieu | 2011-06-15 | 1 | -1/+5 |
| |/ / / / |/| | | | | | | | | | | | | | | If in the memoized method, the last argument is a boolean, it's considered as the reload method. Don't consider it like that if that's a normal method argument. | ||||
* | | | | | Remove obsolete compatibility module | Andrew White | 2011-06-13 | 1 | -11/+0 |
| | | | | | |||||
* | | | | | Rename Time#whole_* to Time#all_* [thanks Pratik!] | David Heinemeier Hansson | 2011-06-13 | 1 | -5/+5 |
| | | | | | |||||
* | | | | | Added Time#whole_day/week/quarter/year as a way of generating ranges ↵ | David Heinemeier Hansson | 2011-06-13 | 1 | -1/+26 |
| | | | | | | | | | | | | | | | | | | | | (example: Event.where(created_at: Time.now.whole_week)) [DHH] | ||||
* | | | | | Added instance_accessor: false as an option to Class#cattr_accessor and ↵ | David Heinemeier Hansson | 2011-06-13 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | friends [DHH] | ||||
* | | | | | Define ActiveSupport#to_param as to_str - closes #1663 | Andrew White | 2011-06-12 | 1 | -0/+4 |
|/ / / / | |||||
* | | | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-06-11 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Fixed minor typo: 'Arraw' to 'Array' | thoefer | 2011-06-11 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | ensuring that json_escape returns html safe strings when passed an html safe ↵ | Aaron Patterson | 2011-06-09 | 1 | -1/+2 |
| |_|_|/ |/| | | | | | | | | | | | string | ||||
* | | | | Merge pull request #1579 from bradleybuda/master | José Valim | 2011-06-08 | 1 | -4/+6 |
|\ \ \ \ | | | | | | | | | | | Date#freeze fails when called more than once in 1.8 | ||||
| * | | | | Allow a Date to be frozen more than once without an error in Ruby 1.8.x | Bradley Buda | 2011-06-08 | 1 | -4/+6 |
| | | | | | |||||
* | | | | | Simplify boolean logic into ternary. | Ben Orenstein | 2011-06-08 | 1 | -1/+1 |
|/ / / / |