aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/test/loading_module/content_controller.rb
Commit message (Collapse)AuthorAgeFilesLines
* Fixed that in some circumstances controllers outside of modules may have ↵David Heinemeier Hansson2005-04-101-0/+1
| | | | | | hidden ones inside modules. For example, admin/content might have been hidden by /content. #1075 [Nicholas Seckar] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1125 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* A hopefully more successful attempt at the Routing branch mergeDavid Heinemeier Hansson2005-02-151-0/+2
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@617 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Backed out of routing merge.. investigating missing patchesDavid Heinemeier Hansson2005-02-151-2/+0
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@616 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Merged back the Routing branchDavid Heinemeier Hansson2005-02-151-0/+2
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@614 5ecf4fe2-1ee6-0310-87b1-e25e094e27de