aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorGuillermo Iguaran <guilleiguaran@gmail.com>2013-12-16 21:19:39 -0800
committerGuillermo Iguaran <guilleiguaran@gmail.com>2013-12-16 21:19:39 -0800
commit666d945064100229ee6eea21e26015156f0a3aa1 (patch)
treec5f0fd5fccf3556fbdf4d2411fffc80896b529b9 /actionpack/lib
parenta6f88d0924649c70d74efe5a09f9abd3117c3920 (diff)
parentd6dec7fcb6b8fddf8c170182d4fe64ecfc7b2261 (diff)
downloadrails-666d945064100229ee6eea21e26015156f0a3aa1.tar.gz
rails-666d945064100229ee6eea21e26015156f0a3aa1.tar.bz2
rails-666d945064100229ee6eea21e26015156f0a3aa1.zip
Merge pull request #13332 from rails/pixeltrix/mail_view
WIP: Integration of mail_view gem
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_dispatch/routing/inspector.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/routing/inspector.rb b/actionpack/lib/action_dispatch/routing/inspector.rb
index 120bc54333..03ac42285d 100644
--- a/actionpack/lib/action_dispatch/routing/inspector.rb
+++ b/actionpack/lib/action_dispatch/routing/inspector.rb
@@ -69,7 +69,7 @@ module ActionDispatch
end
def internal?
- controller.to_s =~ %r{\Arails/(info|welcome)} || path =~ %r{\A#{Rails.application.config.assets.prefix}}
+ controller.to_s =~ %r{\Arails/(info|mailers|welcome)} || path =~ %r{\A#{Rails.application.config.assets.prefix}}
end
def engine?