Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | 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 | |
| | | ||||||
| * | Added link to ActiveResource::Base documentation | sandeepravi | 2011-12-06 | 1 | -1/+1 | |
| | | ||||||
| * | Added link to ActiveResource::Base documentation | sandeepravi | 2011-12-06 | 1 | -1/+1 | |
| | | ||||||
| * | Added git --rebase option for pulling rails master | Thomas von Deyen | 2011-12-06 | 1 | -1/+1 | |
| | | ||||||
| * | Added wiki link to REST | sandeepravi | 2011-12-06 | 1 | -1/+1 | |
| | | ||||||
| * | Added wiki link for REST | sandeepravi | 2011-12-06 | 1 | -1/+1 | |
| | | ||||||
| * | Use do end for multiline block. | Uģis Ozols | 2011-12-05 | 1 | -2/+2 | |
| | | ||||||
| * | .rhtml and .rxml was removed in Rails 3. | Uģis Ozols | 2011-12-05 | 1 | -2/+2 | |
| | | ||||||
| * | Merge branch 'master' of github.com:lifo/docrails | Sergey Parizhskiy | 2011-12-05 | 1 | -1/+1 | |
| |\ | ||||||
| | * | Remove redundant or | Jason Noble | 2011-12-05 | 1 | -1/+1 | |
| | | | ||||||
| * | | changes in the way of how the stylesheets_link_tag works | Sergey Parizhskiy | 2011-12-05 | 1 | -5/+9 | |
| |/ | ||||||
* | | Sync AP CHANGELOG with 3-1-stable | Santiago Pastorino | 2011-12-06 | 1 | -0/+8 | |
| | | ||||||
* | | Merge pull request #3428 from adrianpike/asset_path_conflicts | Santiago Pastorino | 2011-12-06 | 2 | -8/+66 | |
|\ \ | | | | | | | Issue #3427 - asset_path_conflicts | |||||
| * | | Let's do the same trick for asset_path that we do for ↵ | Adrian Pike | 2011-12-05 | 2 | -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é Valim | 2011-12-06 | 1 | -6/+17 | |
| | | | ||||||
* | | | Merge pull request #3876 from tvdeyen/string_as_url_for_expire_action | José Valim | 2011-12-06 | 2 | -3/+22 | |
|\ \ \ | | | | | | | | | Allow string as url for expire_action | |||||
| * | | | Allowing string as url argument for expire_action | Thomas von Deyen | 2011-12-06 | 2 | -3/+22 | |
|/ / / | ||||||
* | | | Merge pull request #3872 from marcandre/i18n_key | José Valim | 2011-12-06 | 2 | -2/+22 | |
|\ \ \ | | | | | | | | | ActiveModel::Name#i18n_key: Fix doc and add tests | |||||
| * | | | ActiveModel::Name#i18n_key: Fix doc and add tests | Marc-Andre Lafortune | 2011-12-05 | 2 | -2/+22 | |
| |/ / | ||||||
* | | | Merge pull request #3873 from iangreenleaf/no_default_tokenizer | José Valim | 2011-12-06 | 1 | -2/+1 | |
|\ \ \ | | | | | | | | | Don't tokenize string when counting characters | |||||
| * | | | Don't tokenize string when counting characters | Ian Young | 2011-12-04 | 1 | -2/+1 | |
| | | | | ||||||
* | | | | make method signatures match the superclass signature | Aaron Patterson | 2011-12-05 | 1 | -2/+2 | |
| | | | | ||||||
* | | | | return value is never tested, so stop calling `presence` | Aaron Patterson | 2011-12-05 | 1 | -1/+1 | |
| |/ / |/| | | ||||||
* | | | Quitoting the table name before querying. | Aaron Patterson | 2011-12-05 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge pull request #3867 from jadeforrest/master | Aaron Patterson | 2011-12-05 | 1 | -1/+6 | |
|\ \ \ | | | | | | | | | Increase performance for table_exists? | |||||
| * | | | Speed up table_exists? for databases with a large number of tables | Jade Rubick | 2011-12-05 | 1 | -1/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | At New Relic, we have hundreds of thousands of tables, and our migrations took 30 minutes without this similar patch. This cuts it down to a more reasonable amount of time. The rescue false part is ugly, but necessary as far as I can tell. I don't know of a cross-database statement you can make that will work without trapping errors. | |||||
* | | | | Merge pull request #3866 from ugisozols/master | José Valim | 2011-12-05 | 1 | -5/+5 | |
|\ \ \ \ | |/ / / |/| | | | Remove .rxml, .rjs and .rhtml from source annotation regexp. | |||||
| * | | | Remove .rxml, .rjs and .rhtml from source annotation regexp. | Uģis Ozols | 2011-12-05 | 1 | -5/+5 | |
|/ / / | ||||||
* | | | Merge pull request #3861 from andyjeffries/master | José Valim | 2011-12-05 | 2 | -3/+3 | |
|\ \ \ | | | | | | | | | Named Routes shouldn't override existing ones (currently route recognition goes with the earliest match, named routes use the latest match) | |||||
| * | | | Named Routes shouldn't override existing ones (currently route recognition ↵ | Andy Jeffries | 2011-12-05 | 2 | -3/+3 | |
| | | | | | | | | | | | | | | | | goes with the earliest match, named routes use the latest match) | |||||
* | | | | Merge pull request #3863 from lest/params-wrapper-inflections | José Valim | 2011-12-05 | 2 | -1/+36 | |
|\ \ \ \ | |/ / / |/| | | | use classify in ParamsWrapper to derive model name from controller name | |||||
| * | | | use classify in ParamsWrapper to derive model name from controller name | lest | 2011-12-05 | 2 | -1/+36 | |
|/ / / | ||||||
* | | | Namespaced attribute lookup now works as 'model/association.attribute'. | José Valim | 2011-12-05 | 2 | -11/+19 | |
| | | |