Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-03-07 | 3 | -7/+6 |
|\ | |||||
| * | 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 | ||||
* | | do not test explicit equality of predicate methods, they should be allowed ↵ | Aaron Patterson | 2011-03-07 | 1 | -5/+1 |
| | | | | | | | | 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 | 8 | -14/+14 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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 | 11 | -75/+118 |
| | |\ | |||||
| | * | | Active Support typos. | R.T. Lechow | 2011-03-04 | 6 | -6/+6 |
| | | | | |||||
| | * | | 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 | 1 | -1/+1 |
| | |/ | |/| | | | | | | | | | | | | | | | | 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 | 6 | -6/+6 |
| | | |||||
* | | 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 |
| | | |||||
* | | 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 | 1 | -23/+29 |
| | | | | | | | | 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 | 1 | -0/+13 |
| | | |||||
* | | adding backwards compat for class cache references. <3<3 | Aaron Patterson | 2011-03-02 | 1 | -1/+12 |
| | | |||||
* | | yo dawg, directly use the class cache rather than the cache of the cache | Aaron Patterson | 2011-03-01 | 1 | -5/+2 |
| | | |||||
* | | refactor Reference to a ClassCache object, fix lazy lookup in Middleware so ↵ | Aaron Patterson | 2011-03-01 | 1 | -11/+32 |
| | | | | | | | | that anonymous classes are supported | ||||
* | | updated Time, Date and DateTime current methods in AS to use Time.zone and ↵ | Josh Kalderimis | 2011-02-28 | 4 | -8/+9 |
| | | | | | | | | | | | | not Time.zone_default. [#6410 state:committed] | ||||
* | | Remove redundant to_sym call. | Ben Orenstein | 2011-02-28 | 1 | -1/+1 |
| | | | | | | | | | | | | [#6483 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | | Make ActiveSupport::Configurable work with modules | Oriol Gual and Josep M. Bach | 2011-02-28 | 1 | -1/+1 |
|/ | | | | | | [#6486 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-02-21 | 2 | -10/+24 |
|\ | |||||
| * | Add a forgotten word. | Ben Orenstein | 2011-02-19 | 1 | -1/+1 |
| | | |||||
| * | Improve clarity of example. Make it follow guidelines for output display. | Ben Orenstein | 2011-02-19 | 1 | -5/+5 |
| | | |||||
| * | Add a clearer example for with_options (lifted from the Active Support guide). | Ben Orenstein | 2011-02-19 | 1 | -5/+19 |
| | | |||||
* | | added Range#count? for Ruby 1.8 | Diego Carrion | 2011-02-19 | 2 | -0/+4 |
|/ | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | merges docrails | Xavier Noria | 2011-02-18 | 1 | -1/+1 |
|\ | |||||
| * | Correct bad wording in description. | Ben Orenstein | 2011-02-14 | 1 | -1/+1 |
| | | |||||
* | | WeakHash is not used, remove it. | Emilio Tagua | 2011-02-18 | 1 | -41/+0 |
| | |