<p>In <a href="http://www.openstreetmap.org/user/saintam1/diary/40383#comment37708">a comment back in February</a>, SomeoneElse pointed out that it would be desirable to allow users to turn off the new HTML mails. This PR implements that, by adding a new user preference, called <code>preferred_email_format</code>.</p>
<p>The new setting can either be <code>multipart</code> or <code>text_only</code>. I hesitated between making it an enum (which seemed semantically more appropriate) or a boolean (which would potentially be more compact). I went with the enum, I'm open to feedback.</p>

<hr>

<h4>You can view, comment on, or merge this pull request online at:</h4>
<p>  <a href='https://github.com/openstreetmap/openstreetmap-website/pull/1511'>https://github.com/openstreetmap/openstreetmap-website/pull/1511</a></p>

<h4>Commit Summary</h4>
<ul>
  <li>Added preferred_email_format option</li>
  <li>Handle anonymous users</li>
  <li>Merge branch 'master' into plain-mail-option</li>
  <li>A couple new changeset comment tests</li>
  <li>A few more tests relating to email format</li>
</ul>

<h4>File Changes</h4>
<ul>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1511/files#diff-0">app/controllers/user_controller.rb</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1511/files#diff-1">app/models/notifier.rb</a>
    (87)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1511/files#diff-2">app/views/user/account.html.erb</a>
    (6)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1511/files#diff-3">config/locales/en.yml</a>
    (4)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1511/files#diff-4">db/migrate/20170320220020_add_preferred_email_format.rb</a>
    (8)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1511/files#diff-5">test/controllers/changeset_controller_test.rb</a>
    (23)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1511/files#diff-6">test/controllers/diary_entry_controller_test.rb</a>
    (31)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1511/files#diff-7">test/controllers/message_controller_test.rb</a>
    (34)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1511/files#diff-8">test/controllers/notes_controller_test.rb</a>
    (30)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1511/files#diff-9">test/controllers/user_controller_test.rb</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1511/files#diff-10">test/fixtures/users.yml</a>
    (26)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1511/files#diff-11">test/integration/user_creation_test.rb</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1511/files#diff-12">test/test_helper.rb</a>
    (31)
  </li>
</ul>

<h4>Patch Links:</h4>
<ul>
  <li><a href='https://github.com/openstreetmap/openstreetmap-website/pull/1511.patch'>https://github.com/openstreetmap/openstreetmap-website/pull/1511.patch</a></li>
  <li><a href='https://github.com/openstreetmap/openstreetmap-website/pull/1511.diff'>https://github.com/openstreetmap/openstreetmap-website/pull/1511.diff</a></li>
</ul>

<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br />You are receiving this because you are subscribed to this thread.<br />Reply to this email directly, <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1511">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/ABWnLVyBTq449YKjboK1wDW1aee8ZIsUks5rrrp4gaJpZM4MwnMh">mute the thread</a>.<img alt="" height="1" src="https://github.com/notifications/beacon/ABWnLekODRX1zK9420vvu0wEutovdXD6ks5rrrp4gaJpZM4MwnMh.gif" width="1" /></p>
<div itemscope itemtype="http://schema.org/EmailMessage">
<div itemprop="action" itemscope itemtype="http://schema.org/ViewAction">
  <link itemprop="url" href="https://github.com/openstreetmap/openstreetmap-website/pull/1511"></link>
  <meta itemprop="name" content="View Pull Request"></meta>
</div>
<meta itemprop="description" content="View this Pull Request on GitHub"></meta>
</div>

<script type="application/json" data-scope="inboxmarkup">{"api_version":"1.0","publisher":{"api_key":"05dde50f1d1a384dd78767c55493e4bb","name":"GitHub"},"entity":{"external_key":"github/openstreetmap/openstreetmap-website","title":"openstreetmap/openstreetmap-website","subtitle":"GitHub repository","main_image_url":"https://cloud.githubusercontent.com/assets/143418/17495839/a5054eac-5d88-11e6-95fc-7290892c7bb5.png","avatar_image_url":"https://cloud.githubusercontent.com/assets/143418/15842166/7c72db34-2c0b-11e6-9aed-b52498112777.png","action":{"name":"Open in GitHub","url":"https://github.com/openstreetmap/openstreetmap-website"}},"updates":{"snippets":[{"icon":"DESCRIPTION","message":"Add a preferred_email_format preference (#1511)"}],"action":{"name":"View Pull Request","url":"https://github.com/openstreetmap/openstreetmap-website/pull/1511"}}}</script>