diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2018-09-28 12:19:43 -0700 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2018-09-28 12:19:43 -0700 |
commit | 8a0a1034955544ee2e4c1f85317c0db84f3aa55b (patch) | |
tree | 1e00acdce252b2ce505ff2e8f9f5acd4ba19bbeb /app/controllers/rails | |
parent | 5ad0813322820a6c42d7b3074531ac40108bfb69 (diff) | |
download | rails-8a0a1034955544ee2e4c1f85317c0db84f3aa55b.tar.gz rails-8a0a1034955544ee2e4c1f85317c0db84f3aa55b.tar.bz2 rails-8a0a1034955544ee2e4c1f85317c0db84f3aa55b.zip |
ActionMailroom -> ActionMailbox
We didn't end up using the mailroom metaphor directly, so let's stick with a more conventional naming strategy.
Diffstat (limited to 'app/controllers/rails')
-rw-r--r-- | app/controllers/rails/.DS_Store | bin | 0 -> 6148 bytes | |||
-rw-r--r-- | app/controllers/rails/conductor/action_mailbox/inbound_emails_controller.rb (renamed from app/controllers/rails/conductor/action_mailroom/inbound_emails_controller.rb) | 8 | ||||
-rw-r--r-- | app/controllers/rails/conductor/action_mailbox/reroutes_controller.rb (renamed from app/controllers/rails/conductor/action_mailroom/reroutes_controller.rb) | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/app/controllers/rails/.DS_Store b/app/controllers/rails/.DS_Store Binary files differnew file mode 100644 index 0000000000..627263b12d --- /dev/null +++ b/app/controllers/rails/.DS_Store diff --git a/app/controllers/rails/conductor/action_mailroom/inbound_emails_controller.rb b/app/controllers/rails/conductor/action_mailbox/inbound_emails_controller.rb index a5a1f34929..70537da9c4 100644 --- a/app/controllers/rails/conductor/action_mailroom/inbound_emails_controller.rb +++ b/app/controllers/rails/conductor/action_mailbox/inbound_emails_controller.rb @@ -1,13 +1,13 @@ -class Rails::Conductor::ActionMailroom::InboundEmailsController < Rails::Conductor::BaseController +class Rails::Conductor::ActionMailbox::InboundEmailsController < Rails::Conductor::BaseController def index - @inbound_emails = ActionMailroom::InboundEmail.order(created_at: :desc) + @inbound_emails = ActionMailbox::InboundEmail.order(created_at: :desc) end def new end def show - @inbound_email = ActionMailroom::InboundEmail.find(params[:id]) + @inbound_email = ActionMailbox::InboundEmail.find(params[:id]) end def create @@ -21,7 +21,7 @@ class Rails::Conductor::ActionMailroom::InboundEmailsController < Rails::Conduct end def create_inbound_email(mail) - ActionMailroom::InboundEmail.create! raw_email: \ + ActionMailbox::InboundEmail.create! raw_email: \ { io: StringIO.new(mail.to_s), filename: 'inbound.eml', content_type: 'message/rfc822', identify: false } end end diff --git a/app/controllers/rails/conductor/action_mailroom/reroutes_controller.rb b/app/controllers/rails/conductor/action_mailbox/reroutes_controller.rb index 028ed9e2d6..226116a3d6 100644 --- a/app/controllers/rails/conductor/action_mailroom/reroutes_controller.rb +++ b/app/controllers/rails/conductor/action_mailbox/reroutes_controller.rb @@ -1,6 +1,6 @@ -class Rails::Conductor::ActionMailroom::ReroutesController < Rails::Conductor::BaseController +class Rails::Conductor::ActionMailbox::ReroutesController < Rails::Conductor::BaseController def create - inbound_email = ActionMailroom::InboundEmail.find(params[:inbound_email_id]) + inbound_email = ActionMailbox::InboundEmail.find(params[:inbound_email_id]) reroute inbound_email redirect_to main_app.rails_conductor_inbound_email_url(inbound_email) |