| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | 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 | |||||
| | * | | | Allow layout fallback when using `layout` method | Prem Sichanugrist | 2011-12-06 | 3 | -26/+93 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails will now use your default layout (such as "layouts/application") when you specify a layout with `:only` and `:except` condition, and those conditions fail. For example, consider this snippet: class CarsController layout 'single_car', :only => :show end Rails will use 'layouts/single_car' when a request comes in `:show` action, and use 'layouts/application' (or 'layouts/cars', if exists) when a request comes in for any other actions. | |||||
| | * | | | Fix bug in assert_template when using only `:layout` option | Prem Sichanugrist | 2011-12-06 | 3 | -14/+32 | |
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently if you're do this: assert_template :layout => "foo" Regardless of what layout you were using, the test will always pass. This was broken since the introduction of :layout option in [d9375f3f]. We have a lot of test cases in actionpack/test/controller/layout_test.rb that use this feature. This will make sure that those test cases are not true negative. | |||||
| * | | | Merge pull request #3894 from kelyar/master | Santiago Pastorino | 2011-12-07 | 1 | -1/+1 | |
| |\ \ \ | | | | | | | | | reversible migration example | |||||
| | * | | | reversible migration example had missing block parameter | Evgeniy Kelyarsky | 2011-12-07 | 1 | -1/+1 | |
| |/ / / | ||||||
| * | | | Merge pull request #3878 from kennyj/should_use_default_charset | José Valim | 2011-12-07 | 2 | -1/+12 | |
| |\ \ \ | |/ / |/| / | |/ | Use default charset when we read content type without charset. | |||||
| | * | Use default charset when we read content type without charset. | kennyj | 2011-12-07 | 2 | -1/+12 | |
| | | | ||||||
| * | | Just track "require" if we have something in the watching stack. | José Valim | 2011-12-06 | 1 | -1/+5 | |
| | | | | | | | | | | | | | | | | | A patch has been provided earlier and we have asked for feedback: https://gist.github.com/1437939 Except one case, all other cases showed improvements in boot time. | |||||
| * | | avoid deprecated methods | Aaron Patterson | 2011-12-06 | 1 | -1/+1 | |
| | | | ||||||
| * | | add prefix and suffix to renamed tables, closes #1510 | Vasiliy Ermolovich | 2011-12-06 | 4 | -0/+52 | |
| | | | ||||||
| * | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-12-06 | 6 | -17/+21 | |
| |\ \ | |/ |/| | ||||||
| | * | Revert "Added link to ActiveResource::Base documentation" | Vijay Dev | 2011-12-06 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 03d438878619cfd3808623f3ed709b6fa166a85c. Conflicts: activeresource/README.rdoc Reason: I don't think this is absolutely necessary given the fact that such links won't work in both GitHub and Rails API at the same time. See links in rails/README.rdoc and rails/Rakefile for some hackery that needs to be done to get such links work in both places. | |||||
| | * | use textile syntax in links | Vijay Dev | 2011-12-06 | 1 | -1/+1 | |
| | | | ||||||
| | * | rxml and rhtml are no longer searched for source code annotations | Vijay Dev | 2011-12-06 | 1 | -1/+1 | |
| | | | ||||||
| | * | copy edits in layouts guide, change links to be relative | Vijay Dev | 2011-12-06 | 1 | -6/+6 | |
| | | | ||||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |