<p><b>@tomhughes</b> requested changes on this pull request.</p>

<hr>

<p>In <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1511#discussion_r117322441">app/models/notifier.rb</a>:</p>
<pre style='color:#555'>> @@ -13,8 +12,8 @@ def signup_confirm(user, token)
                      :display_name => user.display_name,
                      :confirm_string => token.token)
 
-      mail :to => user.email,
-           :subject => I18n.t("notifier.signup_confirm.subject")
+      compose_mail user,
</pre>
<p>Can we make the first argument part of the hash please - I'd suggest as <code>:recipient</code> so that it's a bit more obvious at the call site what that argument is?</p>

<hr>

<p>In <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1511#discussion_r117323163">db/migrate/20170320220020_add_preferred_email_format.rb</a>:</p>
<pre style='color:#555'>> @@ -0,0 +1,8 @@
+require "migrate"
+
+class AddPreferredEmailFormat < ActiveRecord::Migration
+  def change
+    create_enumeration :email_format_enum, %w(text_only multipart)
</pre>
<p>I'd suggest using the actual MIME types here - so <code>text/plain</code> and <code>multipart/alternative</code> or does that cause problems with what postgres allows for enumeration names? If so then maybe just replace the slash with an underscore?</p>

<hr>

<p>In <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1511#discussion_r117323304">test/controllers/changeset_controller_test.rb</a>:</p>
<pre style='color:#555'>> @@ -1,6 +1,7 @@
 require "test_helper"
 require "changeset_controller"
 
+# rubocop:disable ClassLength
</pre>
<p>We normally just change the limit in <code>.rubocop_tobo.yml</code> rather than disable the check altogether.</p>

<hr>

<p>In <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1511#discussion_r117323746">test/controllers/diary_entry_controller_test.rb</a>:</p>
<pre style='color:#555'>> @@ -2,6 +2,7 @@
 
 class DiaryEntryControllerTest < ActionController::TestCase
   include ActionView::Helpers::NumberHelper
+  api_fixtures
</pre>
<p>As <a href="https://github.com/gravitystorm" class="user-mention">@gravitystorm</a> said new tests need to be using factories, not fixtures.</p>

<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#pullrequestreview-39021826">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/ABWnLY06VZmeGm9Ck-A2nYqoKS0qOLqJks5r7JMIgaJpZM4MwnMh">mute the thread</a>.<img alt="" height="1" src="https://github.com/notifications/beacon/ABWnLVB3C-DffQzZ5-oEt0O6xYYi4bEFks5r7JMIgaJpZM4MwnMh.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#pullrequestreview-39021826"></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":"PERSON","message":"@tomhughes requested changes on #1511"}],"action":{"name":"View Pull Request","url":"https://github.com/openstreetmap/openstreetmap-website/pull/1511#pullrequestreview-39021826"}}}</script>