Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-04-23 | 2 | -3/+3 |
|\ | | | | | | | | | Conflicts: activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb | ||||
| * | Grammar fixes for Object#in? documentation. | Cheah Chu Yeow | 2011-04-22 | 1 | -2/+2 |
| | | |||||
| * | NilClass is a singleton | Akira Matsuda | 2011-04-20 | 1 | -1/+1 |
| | | |||||
* | | File watcher won't make the cut for 3.1. Maybe on 3.2. | José Valim | 2011-04-23 | 2 | -234/+0 |
|/ | |||||
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-04-19 | 4 | -25/+112 |
|\ | | | | | | | | | | | Conflicts: railties/guides/source/ajax_on_rails.textile railties/guides/source/generators.textile | ||||
| * | remove unwanted Example headers as per the guidelines, s/instaces of ↵ | Xavier Noria | 2011-04-19 | 1 | -21/+36 |
| | | | | | | | | NilClass/nil/ and friends, completes some rdocs | ||||
| * | commit copy-edit: simplifies blank? rdoc and revises formatting | Xavier Noria | 2011-04-19 | 1 | -24/+23 |
| | | |||||
| * | Revert "Formated docs" | Xavier Noria | 2011-04-19 | 1 | -9/+9 |
| | | | | | | | | | | | | | | Reason: "To be blank" and "to be empty" belongs to our everyday terminology, they go in regular font. This reverts commit 280a8709923d2bf707ec4d82ac1e5cb14941da3d. | ||||
| * | Formated docs | Sebastian Martinez | 2011-04-18 | 1 | -9/+9 |
| | | |||||
| * | oops fixed typo | Sebastian Martinez | 2011-04-18 | 1 | -1/+1 |
| | | |||||
| * | Fixed docs for NilClass#try | Sebastian Martinez | 2011-04-18 | 1 | -8/+8 |
| | | |||||
| * | Formatting docs | Sebastian Martinez | 2011-04-17 | 2 | -11/+11 |
| | | |||||
| * | Docs for +duplicable?+ | Sebastian Martinez | 2011-04-17 | 1 | -4/+28 |
| | | |||||
| * | Docs for NilClass#try | Sebastian Martinez | 2011-04-17 | 1 | -1/+13 |
| | | |||||
| * | Formatting examples | Sebastian Martinez | 2011-04-17 | 1 | -6/+12 |
| | | |||||
| * | Documented String#blank? | Sebastian Martinez | 2011-04-17 | 1 | -1/+7 |
| | | |||||
| * | Documented Hash#blank? | Sebastian Martinez | 2011-04-17 | 1 | -1/+6 |
| | | |||||
| * | Documented Array#blank? | Sebastian Martinez | 2011-04-17 | 1 | -1/+6 |
| | | |||||
| * | Documented TrueClass#blank? | Sebastian Martinez | 2011-04-17 | 1 | -1/+5 |
| | | |||||
| * | Documented FalseClass#blank? | Sebastian Martinez | 2011-04-17 | 1 | -1/+5 |
| | | |||||
| * | Documented NilClass#blank? | Sebastian Martinez | 2011-04-17 | 1 | -1/+5 |
| | | |||||
| * | Added an example of exception situation on Array#sample docs | Sebastian Martinez | 2011-04-15 | 1 | -4/+5 |
| | | |||||
| * | Improved Array#sample documentation | Sebastian Martinez | 2011-04-15 | 1 | -1/+3 |
| | | |||||
* | | remove MultiJson from the Gemfile and instead add the current rc to the AS ↵ | Josh Kalderimis | 2011-04-19 | 1 | -0/+2 |
| | | | | | | | | gemspec | ||||
* | | Merge branch 'master' of https://github.com/rails/rails into multi_json | Josh Kalderimis | 2011-04-19 | 1 | -1/+1 |
|\ \ | |||||
| * | | File should be open in read/write mode. When doing lock on a file. | Arun Agrawal | 2011-04-18 | 1 | -1/+1 |
| | | | |||||
* | | | AS Json parse_error makes a return for backwards compatibility, although it ↵ | Josh Kalderimis | 2011-04-19 | 2 | -1/+5 |
| | | | | | | | | | | | | will return MultiJson::DecodeError | ||||
* | | | removed AS backends and instead rely on MultiJson for json decoding | Josh Kalderimis | 2011-04-18 | 5 | -234/+37 |
|/ / | |||||
* | | Add String#inquiry as a convenience method for turning a string into a ↵ | David Heinemeier Hansson | 2011-04-18 | 4 | -0/+21 |
| | | | | | | | | StringInquirer object [DHH] | ||||
* | | Only rescue a thrown NoMethodError, don't preemptively check for #include?; ↵ | Jared McFarland | 2011-04-15 | 2 | -1/+8 |
| | | | | | | | | added tests | ||||
* | | added an exception to Object#in? to match the methods documentation | Jared McFarland | 2011-04-15 | 1 | -0/+1 |
| | | |||||
* | | files are a special case and need whitespace to be significant | Andre Arko | 2011-04-14 | 1 | -1/+1 |
| | | |||||
* | | gsub is not needed (thanks @fxn!) | Andre Arko | 2011-04-14 | 1 | -1/+1 |
| | | |||||
* | | attributes no longer disappear if a tag contains whitespace | Andre Arko | 2011-04-14 | 2 | -1/+10 |
| | | | | | | | | | | | | | | | | | | | | old: Hash.from_xml("<tag foo='bar'>\n</tag>") => {"tag"=>"\n"} new: Hash.from_xml("<tag foo='bar'>\n</tag>") => {"tag"=>{"foo"=>"bar", "__content__"=>"\n"} | ||||
* | | Add tests for InheritableOptions. | Ben Orenstein | 2011-04-13 | 1 | -0/+26 |
| | | | | | | | | | | | | [#6625 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | | Remove `#among?` from Active Support | Prem Sichanugrist | 2011-04-13 | 7 | -21/+6 |
| | | | | | | | | | | | | After a long list of discussion about the performance problem from using varargs and the reason that we can't find a great pair for it, it would be best to remove support for it for now. It will come back if we can find a good pair for it. For now, Bon Voyage, `#among?`. | ||||
* | | Update test name to the corresponding method name | Sebastian Martinez | 2011-04-12 | 1 | -1/+1 |
|/ | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | Change Object#either? to Object#among? -- thanks to @jamesarosen for the ↵ | David Heinemeier Hansson | 2011-04-12 | 7 | -11/+11 |
| | | | | suggestion! | ||||
* | Cant use inclusion in commands/application.rb as the frameworks havent all ↵ | David Heinemeier Hansson | 2011-04-11 | 1 | -0/+1 |
| | | | | been required yet | ||||
* | Fix failing test case on master | Prem Sichanugrist | 2011-04-10 | 1 | -1/+1 |
| | | | | It turned out that I overlook at some replacements .. | ||||
* | Using Object#in? and Object#either? in various places | Prem Sichanugrist | 2011-04-11 | 5 | -6/+10 |
| | | | | There're a lot of places in Rails source code which make a lot of sense to switching to Object#in? or Object#either? instead of using [].include?. | ||||
* | Add support for Object#in? and Object#either? in Active Support [#6321 ↵ | Prem Sichanugrist, Brian Morearty, John Reitano | 2011-04-11 | 3 | -0/+74 |
| | | | | | | | | | | | | state:committed] This will allow you to check if an object is included in another object or the list of objects or not. This patch is derived from patch by Brian Morearty and John Reitano on Lighthouse ticket. I've rewrite it and make sure that we support both 'another object' and 'list of objects' version, as it surely be useful to support both. | ||||
* | added find_zone and find_zone! to AS timezones and changed the AS Railtie to ↵ | Josh Kalderimis | 2011-04-05 | 5 | -18/+39 |
| | | | | | | use find_zone! as well as adding Railtie tests Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | Raise on invalid timezone | Marc-Andre Lafortune | 2011-04-05 | 3 | -14/+39 |
| | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-04-03 | 1 | -1/+1 |
|\ | |||||
| * | s/ERb/ERB/g | Akira Matsuda | 2011-04-03 | 1 | -1/+1 |
| | | | | | | | | | | The author of ERB sais, his eRuby implementation was originally named "ERb/ERbLight" and then renamed to "ERB" when started bundled as a Ruby standard lib. http://www2a.biglobe.ne.jp/~seki/ruby/erb.html | ||||
* | | Gem::Specification#has_rdoc= is deprecated since rubygems 1.7.0 | Santiago Pastorino | 2011-04-02 | 1 | -2/+0 |
| | | |||||
* | | Moved Turn activation/dependency to railties | David Heinemeier Hansson | 2011-03-31 | 3 | -36/+0 |
| | | |||||
* | | Add using Turn with natural language test case names if the library is ↵ | David Heinemeier Hansson | 2011-03-31 | 4 | -17/+44 |
| | | | | | | | | available (which it will be in Rails 3.1) [DHH] | ||||
* | | require turn only for minitest | David Heinemeier Hansson | 2011-03-31 | 1 | -2/+6 |
| | |