Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of https://github.com/rails/rails into performance_test | Gonçalo Silva | 2011-04-17 | 16 | -31/+184 |
|\ | |||||
| * | 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 | ||||
* | | | don't use internal profiler methods on Rubinius and JRuby since we're only ↵ | Gonçalo Silva | 2011-04-03 | 3 | -8/+14 |
| | | | | | | | | | | | | measuring wall clock for now (and the APIs will/can change, respectively) | ||||
* | | | removed unused class declaration | Gonçalo Silva | 2011-04-03 | 1 | -2/+0 |
| | | | |||||
* | | | Merge branch 'master' of https://github.com/rails/rails into performance_test | Gonçalo Silva | 2011-04-03 | 4 | -31/+33 |
|\| | | |||||
| * | | 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 |
| | | | |||||
| * | | Use Turn to format all Rails tests and enable the natural language case names | David Heinemeier Hansson | 2011-03-31 | 1 | -0/+5 |
| | | | |||||
| * | | Delegate pending to skip if Minitest is available | David Heinemeier Hansson | 2011-03-30 | 1 | -21/+25 |
| |/ | |||||
* | | profiling enabled under JRuby. Added documentation for workaround described ↵ | Gonçalo Silva | 2011-04-03 | 4 | -17/+8 |
| | | | | | | | | in JRUBY-5650. | ||||
* | | check if there is support for the specified metric when profiling | Gonçalo Silva | 2011-03-30 | 4 | -24/+32 |
| | | |||||
* | | fixed a bug where rubinius was creating the profiling files as directories | Gonçalo Silva | 2011-03-30 | 1 | -1/+1 |
| | | |||||
* | | don't allow decimal places on the amount of objects and gc runs | Gonçalo Silva | 2011-03-29 | 1 | -1/+1 |
| | | |||||
* | | improved detection and feedback of supported/unsupported metrics | Gonçalo Silva | 2011-03-28 | 6 | -54/+7 |
| | | |||||
* | | fixed a couple of hidden bugs | Gonçalo Silva | 2011-03-28 | 3 | -3/+4 |
| | | |||||
* | | improved options handling in performance tests | Gonçalo Silva | 2011-03-28 | 4 | -39/+42 |
| | | |||||
* | | we need test-unit on mri 1.9 | Gonçalo Silva | 2011-03-28 | 1 | -3/+7 |
| | | |||||
* | | added profiling and benchmarking capabilities to jruby (profiling is ↵ | Gonçalo Silva | 2011-03-28 | 1 | -18/+53 |
| | | | | | | | | crippled because of a jruby bug) | ||||
* | | benchmarking metrics are also implementation-specific | Gonçalo Silva | 2011-03-28 | 3 | -4/+20 |
| | | |||||
* | | warn the user about unsupported benchmarking metrics he might have asked for | Gonçalo Silva | 2011-03-28 | 1 | -1/+2 |
| | | |||||
* | | removed duplication in rubinius' benchmark code | Gonçalo Silva | 2011-03-28 | 1 | -14/+10 |
| | | |||||
* | | fix a bug where the GC wasn't being triggered at the start of the MRI benchmarks | Gonçalo Silva | 2011-03-28 | 1 | -0/+1 |
| | | |||||
* | | :min_percent only makes sense in a RubyProf context | Gonçalo Silva | 2011-03-28 | 2 | -2/+2 |
| | | |||||
* | | added basic structure for jruby | Gonçalo Silva | 2011-03-26 | 3 | -8/+78 |
| | | |||||
* | | added support for profiling under rubinius | Gonçalo Silva | 2011-03-26 | 3 | -7/+66 |
| | | |||||
* | | fixed time and size units (should be seconds / bytes), fixed typo when ↵ | Gonçalo Silva | 2011-03-25 | 4 | -11/+10 |
| | | | | | | | | counting memory allocations under rubinius | ||||
* | | added gc info (runs, time) to rubinius' benchmarks | Gonçalo Silva | 2011-03-25 | 1 | -2/+6 |
| | | |||||
* | | added memory size and allocations to rubinius' benchmarks | Gonçalo Silva | 2011-03-25 | 1 | -2/+10 |
| | | |||||
* | | added time (wall, process, cpu) to rubinius' benchmarks | Gonçalo Silva | 2011-03-25 | 1 | -3/+11 |
| | | |||||
* | | added missing require | Gonçalo Silva | 2011-03-25 | 1 | -0/+2 |
| | | |||||
* | | removed leftovers from the copy-paste from mri | Gonçalo Silva | 2011-03-25 | 1 | -9/+0 |
| | | |||||
* | | rubinius returns "rbx" for RUBY_ENGINE, not "rubinius" | Gonçalo Silva | 2011-03-25 | 1 | -2/+2 |
| | |