David Heinemeier Hansson
|
87bed3af47
|
Fixed that in some circumstances controllers outside of modules may have 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
|
2005-04-10 15:01:35 +00:00 |
|
David Heinemeier Hansson
|
b1999be5a7
|
A hopefully more successful attempt at the Routing branch merge
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@617 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
|
2005-02-15 01:45:35 +00:00 |
|
David Heinemeier Hansson
|
88a3343ed5
|
Backed out of routing merge.. investigating missing patches
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@616 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
|
2005-02-15 01:24:55 +00:00 |
|
David Heinemeier Hansson
|
c844755e5a
|
Merged back the Routing branch
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@614 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
|
2005-02-15 00:51:02 +00:00 |
|