Merge branch 'ticket/unstable/792-confirmation-emails' into unstable (00df8321) · Commits · Projects / OHR Support · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

O

OHR Support
- Activity
- Members
- Labels
- Releases
- Incidents
- Service Desk

Snippets Groups Projects

Projects
OHR Support
Commits
00df8321

Commit 00df8321 authored 13 years ago by

Eric Davis

Downloads
- Plain Diff

Merge branch 'ticket/unstable/792-confirmation-emails' into unstable

parents 66fe8287 dc541597

Tags

No related merge requests found

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

app/models/mail_handler.rb 7 additions, 0 deletions

app/models/mail_handler.rb
app/models/mailer.rb 38 additions, 0 deletions

app/models/mailer.rb
app/views/mailer/mail_handler_confirmation.text.html.rhtml 2 additions, 0 deletions

app/views/mailer/mail_handler_confirmation.text.html.rhtml
app/views/mailer/mail_handler_confirmation.text.plain.rhtml 2 additions, 0 deletions

app/views/mailer/mail_handler_confirmation.text.plain.rhtml
app/views/mailer/mail_handler_missing_information.text.html.rhtml 3 additions, 0 deletions

...s/mailer/mail_handler_missing_information.text.html.rhtml
app/views/mailer/mail_handler_missing_information.text.plain.rhtml 3 additions, 0 deletions

.../mailer/mail_handler_missing_information.text.plain.rhtml
app/views/mailer/mail_handler_unauthorized_action.text.html.rhtml 1 addition, 0 deletions

...s/mailer/mail_handler_unauthorized_action.text.html.rhtml
app/views/mailer/mail_handler_unauthorized_action.text.plain.rhtml 1 addition, 0 deletions

.../mailer/mail_handler_unauthorized_action.text.plain.rhtml
app/views/settings/_mail_handler.rhtml 3 additions, 0 deletions

app/views/settings/_mail_handler.rhtml
config/locales/en.yml 8 additions, 1 deletion

config/locales/en.yml
config/settings.yml 5 additions, 1 deletion

config/settings.yml
test/fixtures/mail_handler/ticket_on_project_with_missing_information.eml 23 additions, 0 deletions

...il_handler/ticket_on_project_with_missing_information.eml
test/unit/mail_handler_test.rb 116 additions, 12 deletions

test/unit/mail_handler_test.rb

with 212 additions and 14 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment