aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix broken test_exists_query_logging from the table_exists? changeJon Leighton2011-12-081-0/+1
|
* Remove dead broken code from AD::RequestJosé Valim2011-12-081-8/+0
|
* Merge pull request #3888 from kennyj/should_use_default_charsetJosé Valim2011-12-082-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 ↵kennyj2011-12-072-0/+7
| | | | | | | | time.
* | Merge pull request #3901 from mark-rushakoff/inflection-regex-fixJosé Valim2011-12-082-4/+8
|\ \ | | | | | | Fix inflection regexes for mouse, mice
| * | Fix inflection regexes for mouse, miceMark Rushakoff2011-12-072-4/+8
|/ /
* | moving ignored regexp to the instanceAaron Patterson2011-12-071-6/+8
| |
* | speeding up ignored sql testingAaron Patterson2011-12-071-1/+4
| |
* | Use a hash to look up column definitionsAaron Patterson2011-12-071-2/+3
| |
* | try to normalize the objects passed to column()Aaron Patterson2011-12-071-9/+11
| |
* | automatically add the column definition to the columns list if creating a ↵Aaron Patterson2011-12-071-12/+21
| | | | | | | | new one
* | stop calling String#to_s so frequentlyAaron Patterson2011-12-071-3/+4
| |
* | the required sqlite3 adapter responds to encoding, so stop checking.Aaron Patterson2011-12-071-5/+1
| |
* | Remove #:nodoc: from partial renderer.José Valim2011-12-071-1/+1
| |
* | Merge pull request #3895 from kennyj/should_use_freezed_constantJosé Valim2011-12-073-24/+40
|\ \ | | | | | | Should use freezed string constant here.
| * | Use freezed string constant. Some string literals is used repeatedly.kennyj2011-12-083-24/+40
| | |
* | | Merge pull request #3889 from kielkowicz/masterJosé Valim2011-12-074-69/+135
|\ \ \ | |/ / |/| | Annotating haml and slim file
| * | Moves migrations tests from railties/test/application/rake_test.rb to ↵Kazimierz Kiełkowicz2011-12-072-68/+85
| | | | | | | | | | | | railties/test/application/rake/migrations_test.rb
| * | Move rake notes test to railties/test/application/rake/notes_test.rbKazimierz Kiełkowicz2011-12-072-42/+45
| | |
| * | Update source_annotation_extractor comment.Kazimierz Kiełkowicz2011-12-071-1/+1
| | |
| * | Add annotation to haml and slim template.Kazimierz Kiełkowicz2011-12-072-0/+46
| | |
* | | Merge pull request #3884 from sikachu/master-fix_layoutJosé Valim2011-12-076-40/+125
|\ \ \ | | | | | | | | Allow layout fallback when using `layout` method
| * | | Allow layout fallback when using `layout` methodPrem Sichanugrist2011-12-063-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` optionPrem Sichanugrist2011-12-063-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/masterSantiago Pastorino2011-12-071-1/+1
|\ \ \ | | | | | | | | reversible migration example
| * | | reversible migration example had missing block parameterEvgeniy Kelyarsky2011-12-071-1/+1
|/ / /
* | | Merge pull request #3878 from kennyj/should_use_default_charsetJosé Valim2011-12-072-1/+12
|\ \ \ | |/ / |/| / | |/ Use default charset when we read content type without charset.
| * Use default charset when we read content type without charset.kennyj2011-12-072-1/+12
| |
* | Just track "require" if we have something in the watching stack.José Valim2011-12-061-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 methodsAaron Patterson2011-12-061-1/+1
| |
* | add prefix and suffix to renamed tables, closes #1510Vasiliy Ermolovich2011-12-064-0/+52
| |
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-12-066-17/+21
|\ \ | |/ |/|
| * Revert "Added link to ActiveResource::Base documentation"Vijay Dev2011-12-061-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 linksVijay Dev2011-12-061-1/+1
| |
| * rxml and rhtml are no longer searched for source code annotationsVijay Dev2011-12-061-1/+1
| |
| * copy edits in layouts guide, change links to be relativeVijay Dev2011-12-061-6/+6
| |
| * Added link to ActiveResource::Base documentationsandeepravi2011-12-061-1/+1
| |
| * Added link to ActiveResource::Base documentationsandeepravi2011-12-061-1/+1
| |
| * Added git --rebase option for pulling rails masterThomas von Deyen2011-12-061-1/+1
| |
| * Added wiki link to RESTsandeepravi2011-12-061-1/+1
| |
| * Added wiki link for RESTsandeepravi2011-12-061-1/+1
| |
| * Use do end for multiline block.Uģis Ozols2011-12-051-2/+2
| |
| * .rhtml and .rxml was removed in Rails 3.Uģis Ozols2011-12-051-2/+2
| |
| * Merge branch 'master' of github.com:lifo/docrailsSergey Parizhskiy2011-12-051-1/+1
| |\
| | * Remove redundant orJason Noble2011-12-051-1/+1
| | |
| * | changes in the way of how the stylesheets_link_tag worksSergey Parizhskiy2011-12-051-5/+9
| |/
* | Sync AP CHANGELOG with 3-1-stableSantiago Pastorino2011-12-061-0/+8
| |
* | Merge pull request #3428 from adrianpike/asset_path_conflictsSantiago Pastorino2011-12-062-8/+66
|\ \ | | | | | | Issue #3427 - asset_path_conflicts
| * | Let's do the same trick for asset_path that we do for ↵Adrian Pike2011-12-052-8/+66
| | | | | | | | | | | | | | | | | | [image,javascript,stylesheet]_path to avoid namespace conflicts on named routes. Closes #3427
* | | Ensure length validator also works on 1.8.7.José Valim2011-12-061-6/+17
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 12:12:18 +0000