Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix #3890. (Calling proxy_association in scope chain.) | Jon Leighton | 2011-12-08 | 3 | -3/+19 |
| | |||||
* | Fix a regression and also fix broken test. | José Valim | 2011-12-08 | 2 | -9/+14 |
| | |||||
* | fix nodocs | Vijay Dev | 2011-12-09 | 5 | -11/+11 |
| | |||||
* | add haml and slim to the list of extensions supported by rake notes | Vijay Dev | 2011-12-09 | 1 | -1/+1 |
| | |||||
* | fix comments | Vijay Dev | 2011-12-09 | 1 | -4/+2 |
| | |||||
* | minor text change | Vijay Dev | 2011-12-09 | 1 | -1/+1 |
| | |||||
* | Remove NilClass whiners feature. | José Valim | 2011-12-08 | 3 | -85/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Removing this feature causes boost in performance when using Ruby 1.9. Ruby 1.9 started to do implicit conversions using `to_ary` and `to_str` in some STDLIB methods (like Array#join). To do such implicit conversions, Ruby 1.9 always dispatches the method and rescues the NoMethodError exception in case one is raised. Therefore, since the whiners feature defined NilClass#method_missing, such implicit conversions for nil became much, much slower. In fact, just defining NilClass#method_missing (even without the whiners feature) already causes a massive slow down. Here is a snippet that shows such slow down: require "benchmark" Benchmark.realtime { 1_000.times { [nil,nil,nil].join } } class NilClass def method_missing(*args) raise NoMethodError end end Benchmark.realtime { 1_000.times { [nil,nil,nil].join } } | ||||
* | Improve cache on route_key lookup. | José Valim | 2011-12-08 | 3 | -6/+37 |
| | |||||
* | fixing eval'd line numbers. | Aaron Patterson | 2011-12-08 | 1 | -2/+2 |
| | |||||
* | Regexp.union seems to have different results in 1.8 | Aaron Patterson | 2011-12-08 | 1 | -3/+3 |
| | |||||
* | Revert accidental change from cattr_accessor to class_attribute. | José Valim | 2011-12-08 | 1 | -1/+1 |
| | |||||
* | Merge pull request #3909 from laserlemon/patch-1 | Xavier Noria | 2011-12-08 | 2 | -4/+7 |
|\ | | | | | Add dependency status (a la build status) to the README | ||||
| * | Add dependency status (a la build status) to the README | Steve Richert | 2011-12-08 | 2 | -4/+7 |
|/ | |||||
* | Merge pull request #3908 from kennyj/should_use_default_charset | José Valim | 2011-12-08 | 1 | -2/+3 |
|\ | | | | | Fix a failure in railties on ruby 1.8.x | ||||
| * | Fix testcase an error on ruby 1.8.x. | kennyj | 2011-12-09 | 1 | -2/+3 |
| | | | | | | | | | | | | In Ruby 1.8.x, config.encoding sets $KCODE. Therefore, the possible values are UTF8, SJIS, or EUC. And, if we set SJIS, we'll has the error. Because some rails sources are written in utf-8 encoding. | ||||
* | | Merge pull request #3906 from kennyj/fix_warnings_for_params_wrapper_test | José Valim | 2011-12-08 | 1 | -1/+1 |
|\ \ | | | | | | | Fix warning for params_wrapper_test.rb | ||||
| * | | Fix warning for params_wrapper_test. | kennyj | 2011-12-08 | 1 | -1/+1 |
| | | | |||||
* | | | Just use the proc if there is a chance of layout lookup. | José Valim | 2011-12-08 | 1 | -5/+6 |
| | | | |||||
* | | | Optimize layout lookup to avoid double calls. | José Valim | 2011-12-08 | 4 | -33/+41 |
| | | | |||||
* | | | Some small optimizations and improvements to benchmark code. | José Valim | 2011-12-08 | 4 | -17/+15 |
| | | | |||||
* | | | Add performance scripts from wycats/rails-simple-benches to actionpack. | José Valim | 2011-12-08 | 10 | -1/+217 |
| | | | |||||
* | | | Remove rb-fsevent from Gemfile. | José Valim | 2011-12-08 | 1 | -3/+0 |
|/ / | |||||
* | | updates the host and port of publish_docs, and changes the release ↵ | Xavier Noria | 2011-12-08 | 2 | -2/+2 |
| | | | | | | | | instructions to use the task rather than curl (thanks to Vijay Dev for spotting this one) | ||||
* | | use our own fork of sdoc while Vijay's fix is not applied to voloko/sdoc | Xavier Noria | 2011-12-08 | 1 | -1/+5 |
| | | |||||
* | | releasing instructions: updates the URLs that triggers stable docs ↵ | Xavier Noria | 2011-12-08 | 1 | -1/+1 |
| | | | | | | | | generation and publishing | ||||
* | | Merge pull request #3900 from jfturcot/accessible_wrap_params | José Valim | 2011-12-08 | 3 | -2/+41 |
|\ \ | | | | | | | ParamsWrapper only wrap the accessible attributes when they were set | ||||
| * | | Add information to the changelog about the changes to ↵ | Jean-Francois Turcot | 2011-12-08 | 1 | -0/+5 |
| | | | | | | | | | | | | ActionController::ParamsWrapper | ||||
| * | | ParamsWrapper only wrap the accessible attributes when they were set | Jean-Francois Turcot | 2011-12-07 | 2 | -2/+36 |
| | | | |||||
* | | | Fix broken test_exists_query_logging from the table_exists? change | Jon Leighton | 2011-12-08 | 1 | -0/+1 |
| | | | |||||
* | | | Remove dead broken code from AD::Request | José Valim | 2011-12-08 | 1 | -8/+0 |
| | | | |||||
* | | | Merge pull request #3888 from kennyj/should_use_default_charset | José Valim | 2011-12-08 | 2 | -0/+7 |
|\ \ \ | | |/ | |/| | Assign config.encoding to AD::Response.default_charset at the initialization time. | ||||
| * | | Assign config.encoding to AD::Response.default_charset at the initialization ↵ | kennyj | 2011-12-07 | 2 | -0/+7 |
| | | | | | | | | | | | | time. | ||||
* | | | Merge pull request #3901 from mark-rushakoff/inflection-regex-fix | José Valim | 2011-12-08 | 2 | -4/+8 |
|\ \ \ | | | | | | | | | Fix inflection regexes for mouse, mice | ||||
| * | | | Fix inflection regexes for mouse, mice | Mark Rushakoff | 2011-12-07 | 2 | -4/+8 |
|/ / / | |||||
* | | | moving ignored regexp to the instance | Aaron Patterson | 2011-12-07 | 1 | -6/+8 |
| | | | |||||
* | | | speeding up ignored sql testing | Aaron Patterson | 2011-12-07 | 1 | -1/+4 |
| | | | |||||
* | | | Use a hash to look up column definitions | Aaron Patterson | 2011-12-07 | 1 | -2/+3 |
| | | | |||||
* | | | try to normalize the objects passed to column() | Aaron Patterson | 2011-12-07 | 1 | -9/+11 |
| | | | |||||
* | | | automatically add the column definition to the columns list if creating a ↵ | Aaron Patterson | 2011-12-07 | 1 | -12/+21 |
| | | | | | | | | | | | | new one | ||||
* | | | stop calling String#to_s so frequently | Aaron Patterson | 2011-12-07 | 1 | -3/+4 |
| | | | |||||
* | | | the required sqlite3 adapter responds to encoding, so stop checking. | Aaron Patterson | 2011-12-07 | 1 | -5/+1 |
| |/ |/| | |||||
* | | Remove #:nodoc: from partial renderer. | José Valim | 2011-12-07 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #3895 from kennyj/should_use_freezed_constant | José Valim | 2011-12-07 | 3 | -24/+40 |
|\ \ | | | | | | | Should use freezed string constant here. | ||||
| * | | Use freezed string constant. Some string literals is used repeatedly. | kennyj | 2011-12-08 | 3 | -24/+40 |
| | | | |||||
* | | | Merge pull request #3889 from kielkowicz/master | José Valim | 2011-12-07 | 4 | -69/+135 |
|\ \ \ | |/ / |/| | | Annotating haml and slim file | ||||
| * | | Moves migrations tests from railties/test/application/rake_test.rb to ↵ | Kazimierz Kiełkowicz | 2011-12-07 | 2 | -68/+85 |
| | | | | | | | | | | | | railties/test/application/rake/migrations_test.rb | ||||
| * | | Move rake notes test to railties/test/application/rake/notes_test.rb | Kazimierz Kiełkowicz | 2011-12-07 | 2 | -42/+45 |
| | | | |||||
| * | | Update source_annotation_extractor comment. | Kazimierz Kiełkowicz | 2011-12-07 | 1 | -1/+1 |
| | | | |||||
| * | | Add annotation to haml and slim template. | Kazimierz Kiełkowicz | 2011-12-07 | 2 | -0/+46 |
| | | | |||||
* | | | Merge pull request #3884 from sikachu/master-fix_layout | José Valim | 2011-12-07 | 6 | -40/+125 |
|\ \ \ | | | | | | | | | Allow layout fallback when using `layout` method |