aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* Update ActionMailer guide's 'Sending Multipart Emails with Attachments' ↵Barry Hess2009-04-201-8/+9
| | | | section to show explicitly which order text/plain and text/html parts must be in as well as the proper way to define the multipart/alternative part.
* Added touch to associations guideMike Gunderloy2009-04-191-0/+24
|
* Remove named scopes from query guide contents, separate guide is comingMike Gunderloy2009-04-191-1/+0
|
* fixes email/radio mismatch reported by Marek in LHXavier Noria2009-04-181-3/+3
|
* adds a missing wordXavier Noria2009-04-181-1/+1
|
* Initial Active Support guideXavier Noria2009-04-181-0/+16
|
* Updated migration section to mention that SQLite now supports transactional ↵Jared Giles2009-04-171-1/+1
| | | | migrations
* Initial template guidelifo2009-04-171-0/+18
|
* Merge commit 'mainstream/master'lifo2009-04-1711-56/+60
|\ | | | | | | | | | | Conflicts: actionpack/lib/action_controller/base.rb railties/guides/source/caching_with_rails.textile
| * Makes rails-dev-boost work againCarl Lerche & Yehuda Katz2009-04-141-1/+1
| |
| * Fix requires so tests runJeremy Kemper2009-04-141-2/+2
| |
| * Rails server boots againCarl Lerche & Yehuda Katz2009-04-132-2/+2
| |
| * Bring abstract_controller up to date with rails/masterCarl Lerche & Yehuda Katz2009-04-13261-35493/+15694
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolved all the conflicts since 2.3.0 -> HEAD. Following is a list of commits that could not be applied cleanly or are obviated with the abstract_controller refactor. They all need to be revisited to ensure that fixes made in 2.3 do not reappear in 3.0: 2259ecf368e6a6715966f69216e3ee86bf1a82a7 AR not available * This will be reimplemented with ActionORM or equivalent 06182ea02e92afad579998aa80144588e8865ac3 implicitly rendering a js response should not use the default layout [#1844 state:resolved] * This will be handled generically 893e9eb99504705419ad6edac14d00e71cef5f12 Improve view rendering performance in development mode and reinstate template recompiling in production [#1909 state:resolved] * We will need to reimplement rails-dev-boost on top of the refactor; the changes here are very implementation specific and cannot be cleanly applied. The following commits are implicated: 199e750d46c04970b5e7684998d09405648ecbd4 3942cb406e1d5db0ac00e03153809cc8dc4cc4db f8ea9f85d4f1e3e6f3b5d895bef6b013aa4b0690 e3b166aab37ddc2fbab030b146eb61713b91bf55 ae9f258e03c9fd5088da12c1c6cd216cc89a01f7 44423126c6f6133a1d9cf1d0832b527e8711d40f 0cb020b4d6d838025859bd60fb8151c8e21b8e84 workaround for picking layouts based on wrong view_paths [#1974 state:resolved] * The specifics of this commit no longer apply. Since it is a two-line commit, we will reimplement this change. 8c5cc66a831aadb159f3daaffa4208064c30af0e make action_controller/layouts pick templates from the current instance's view_paths instead of the class view_paths [#1974 state:resolved] * This does not apply at all. It should be trivial to apply the feature to the reimplemented ActionController::Base. 87e8b162463f13bd50d27398f020769460a770e3 fix HTML fallback for explicit templates [#2052 state:resolved] * There were a number of patches related to this that simply compounded each other. Basically none of them apply cleanly, and the underlying issue needs to be revisited. After discussing the underlying problem with Koz, we will defer these fixes for further discussion.
| | * Improve tests and code for Rails::InfoController and Rails::Info [#2411 ↵Manfred Stienstra2009-04-073-32/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | state:resolved] - Refactor Rails::InfoController tests. - Return forbidden status from the InfoController for remote requests instead of a 500. - Add tests for displaying middleware in Rails::Info. Signed-off-by: Joshua Peek <josh@joshpeek.com>
| | * Merge docrailsPratik Naik2009-04-056-151/+143
| | |
| * | Make tests passYehuda Katz2009-02-022-2/+2
| | |
| * | Merge commit 'rails/3-0-unstable'Yehuda Katz2009-01-301-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/base.rb actionpack/lib/action_dispatch/http/mime_type.rb actionpack/lib/action_dispatch/http/request.rb actionpack/lib/action_view/base.rb actionpack/lib/action_view/paths.rb actionpack/test/controller/session/cookie_store_test.rb actionpack/test/dispatch/rack_test.rb actionpack/test/dispatch/request_test.rb
| | * | Reorganize ActionController folder structureJoshua Peek2009-01-271-1/+1
| | | |
* | | | in 2.3 release notes, fix name of a rake taskXavier Noria2009-04-131-1/+1
| | | |
* | | | Fix typo in release notesMike Gunderloy2009-04-111-1/+1
| | | |
* | | | Revert "Changes to indicate release notes refer to most recent point releases,"Mike Gunderloy2009-04-072-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Rails numbering: 2.2.2 and 2.3.2 are the release versions, so original wording is fine. Release notes refer to the first *release* version, not the the earlier RC versions. This reverts commit 858dbeb4fde52494976e4aa55fb127181a078cd7.
* | | | Changes to indicate release notes refer to most recent point releases,Rick Moynihan2009-04-072-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not the initial release. It would be good to make this more explicit still. The motivation for the change was that ActiveRecords find_in_batches is documented to have been released in rails 2.3, but was actually only released in 2.3.2.
* | | | Starting work on Action View Overview guideTrevor Turk2009-04-051-0/+69
| | | |
* | | | Supply fullfile name to the generatorPratik Naik2009-04-051-1/+1
| | | |
* | | | Namespace under RailsGuidesPratik Naik2009-04-051-23/+25
| | | |
* | | | fixes spelling of "JavaScript" and link to the complex form examples appXavier Noria2009-04-051-1/+1
| | | |
* | | | Merge commit 'mainstream/master'Pratik Naik2009-04-042-2/+16
|\ \ \ \ | | |_|/ | |/| |
| * | | Show installed middleware in builtin rails info (/rails/info/properties) ↵Michael Schuerig2009-04-022-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | [#2396 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * | | Merge docrailsPratik Naik2009-03-248-3/+67
| | | |
* | | | Merge branch 'master' of git@github.com:lifo/docrailsXavier Noria2009-04-031-1/+1
|\ \ \ \
| * | | | Typo fixNathan Lloyd Smith2009-04-031-1/+1
| | | | |
* | | | | deletes screencast promo in prologue, its proper place is the References sectionXavier Noria2009-04-031-9/+6
|/ / / /
* | | | list -> indexXavier Noria2009-04-031-1/+1
| | | |
* | | | in caching guide, RESTifies some examples, revised conventions here and thereXavier Noria2009-04-031-25/+24
| | | |
* | | | Tech edit of caching guide from Gregg PollackMike Gunderloy2009-04-031-124/+120
| | | |
* | | | Fix two typos in a comment in config/initializers/backtrace_silencers.rbchrisk2009-03-311-1/+1
| | | |
* | | | With -> with in a titleXavier Noria2009-03-301-1/+1
| | | |
* | | | Clear up a little confusing wording in Routing Guide.Mike Gunderloy2009-03-271-3/+3
| | | |
* | | | copyedited minor details in the rack on rails guideXavier Noria2009-03-261-17/+17
| | | |
* | | | Merge branch 'master' of git@github.com:lifo/docrailsMike Gunderloy2009-03-2437-557/+425
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: railties/guides/source/2_3_release_notes.textile
| * | | | Merge commit 'mainstream/master'Pratik Naik2009-03-245-446/+33
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: railties/guides/images/fxn.jpg railties/guides/rails_guides/generator.rb
| | * | | Ensure script/plugin doesn't show error message when svn externals are not therePratik Naik2009-03-181-4/+7
| | | | |
| | * | | Remove outdated script/plugin optionsPratik Naik2009-03-182-432/+5
| | | | |
| | * | | Try to use actionpack gem to generate guide when Rails is not vendoredPratik Naik2009-03-173-155/+19
| | | | |
| | * | | Merge docrailsPratik Naik2009-03-1639-847/+1874
| | | | |
| * | | | Fix a small typoPratik Naik2009-03-221-1/+1
| | | | |
| * | | | ensure authors get warnings about broken links, and ensure end users don'tXavier Noria2009-03-222-1/+2
| | | | |
| * | | | in guides generator, warn about duplicate header IDs only if ↵Xavier Noria2009-03-221-1/+1
| | | | | | | | | | | | | | | | | | | | WARN_DUPLICATE_HEADERS
| * | | | replace edit distance implementation with one written from scratch to avoid ↵Xavier Noria2009-03-221-108/+25
| | | | | | | | | | | | | | | | | | | | license issues
| * | | | removes a wrong comment in the finders guideXavier Noria2009-03-211-1/+0
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-30 15:20:03 +0000