aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | 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
| | |
* | | Merge pull request #3876 from tvdeyen/string_as_url_for_expire_actionJosé Valim2011-12-062-3/+22
|\ \ \ | | | | | | | | Allow string as url for expire_action
| * | | Allowing string as url argument for expire_actionThomas von Deyen2011-12-062-3/+22
|/ / /
* | | Merge pull request #3872 from marcandre/i18n_keyJosé Valim2011-12-062-2/+22
|\ \ \ | | | | | | | | ActiveModel::Name#i18n_key: Fix doc and add tests
| * | | ActiveModel::Name#i18n_key: Fix doc and add testsMarc-Andre Lafortune2011-12-052-2/+22
| |/ /
* | | Merge pull request #3873 from iangreenleaf/no_default_tokenizerJosé Valim2011-12-061-2/+1
|\ \ \ | | | | | | | | Don't tokenize string when counting characters
| * | | Don't tokenize string when counting charactersIan Young2011-12-041-2/+1
| | | |
* | | | make method signatures match the superclass signatureAaron Patterson2011-12-051-2/+2
| | | |
* | | | return value is never tested, so stop calling `presence`Aaron Patterson2011-12-051-1/+1
| |/ / |/| |
* | | Quitoting the table name before querying.Aaron Patterson2011-12-051-1/+1
| | |
* | | Merge pull request #3867 from jadeforrest/masterAaron Patterson2011-12-051-1/+6
|\ \ \ | | | | | | | | Increase performance for table_exists?
| * | | Speed up table_exists? for databases with a large number of tablesJade Rubick2011-12-051-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/masterJosé Valim2011-12-051-5/+5
|\ \ \ \ | |/ / / |/| | | Remove .rxml, .rjs and .rhtml from source annotation regexp.
| * | | Remove .rxml, .rjs and .rhtml from source annotation regexp.Uģis Ozols2011-12-051-5/+5
|/ / /
* | | Merge pull request #3861 from andyjeffries/masterJosé Valim2011-12-052-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 Jeffries2011-12-052-3/+3
| | | | | | | | | | | | | | | | goes with the earliest match, named routes use the latest match)
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-13 17:18:25 +0000