<p dir="auto">Continues <a class="issue-link js-issue-link" data-error-text="Failed to load title" data-id="2357596422" data-permission-text="Title is private" data-url="https://github.com/openstreetmap/openstreetmap-website/issues/4905" data-hovercard-type="pull_request" data-hovercard-url="/openstreetmap/openstreetmap-website/pull/4905/hovercard" href="https://github.com/openstreetmap/openstreetmap-website/pull/4905">#4905</a>.</p>
<p dir="auto">Supersedes <a class="issue-link js-issue-link" data-error-text="Failed to load title" data-id="2215094007" data-permission-text="Title is private" data-url="https://github.com/openstreetmap/openstreetmap-website/issues/4634" data-hovercard-type="pull_request" data-hovercard-url="/openstreetmap/openstreetmap-website/pull/4634/hovercard" href="https://github.com/openstreetmap/openstreetmap-website/pull/4634">#4634</a>.</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/4978'>https://github.com/openstreetmap/openstreetmap-website/pull/4978</a></p>

<h4>Commit Summary</h4>
<ul>
  <li><a href="https://github.com/openstreetmap/openstreetmap-website/pull/4978/commits/b69159795bc9c1a916b0d59e3edbefbc700561fb" class="commit-link">b691597</a>  Add new diary comment template</li>
  <li><a href="https://github.com/openstreetmap/openstreetmap-website/pull/4978/commits/a6013fdadc24832a587c3c2abc3a761a2b8ec74c" class="commit-link">a6013fd</a>  Move diary comment action to comments controller</li>
</ul>

<h4 style="display: inline-block">File Changes </h4> <p style="display: inline-block">(<a href="https://github.com/openstreetmap/openstreetmap-website/pull/4978/files">9 files</a>)</p>
<ul>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/4978/files#diff-debf59904131dc89a88ab44cbb1d6deaaa5a7d70c0507f674080df62f7c8e41f">app/abilities/ability.rb</a>
    (3)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/4978/files#diff-3c862c4b76c5629c1aeb9076a68805579f475b14d126b8a9691ff9ae2e00f76e">app/controllers/diary_comments_controller.rb</a>
    (33)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/4978/files#diff-4b73866ef57c70fca07c0f330d7a57aae939b11e4aae0514f303df3aa3762f89">app/controllers/diary_entries_controller.rb</a>
    (31)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/4978/files#diff-2c4883274c71a038516f0b49417124dea87b9e2acc71564ce1427c2e771ae83c">app/views/diary_comments/new.html.erb</a>
    (12)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/4978/files#diff-f54930d1342191d1e34f17bfc8a2b7f09fa283f05a3332495092abe2cbae50be">app/views/diary_entries/show.html.erb</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/4978/files#diff-44438ce218f5287c58d0017f965d888715635d94280669896f75841fbd7b4cd7">config/locales/en.yml</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/4978/files#diff-959bc9abc46a55332bb64d5155a79323afa75a50ec1a2137ddd22d926f62c6c5">config/routes.rb</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/4978/files#diff-2c3b3662e44be71c024967a2cefccfd23f10c363eadb2985ff4896454b01845e">test/controllers/diary_comments_controller_test.rb</a>
    (111)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/4978/files#diff-10a5c4533814c8b1222f0ef0833c82edd68584d85757fc431557b39813777c19">test/controllers/diary_entries_controller_test.rb</a>
    (111)
  </li>
</ul>

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

<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br />Reply to this email directly, <a href="https://github.com/openstreetmap/openstreetmap-website/pull/4978">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AAK2OLK3YCD6OZSE67SMWQDZL7UGTAVCNFSM6AAAAABKZCH4ZWVHI2DSMVQWIX3LMV43ASLTON2WKOZSGQYDKNZYHEYTMNQ">unsubscribe</a>.<br />You are receiving this because you are subscribed to this thread.<img src="https://github.com/notifications/beacon/AAK2OLPWH6KPEFYRUKF3WALZL7UGTA5CNFSM6AAAAABKZCH4ZWWGG33NNVSW45C7OR4XAZNFJFZXG5LFVJRW63LNMVXHIX3JMTHI6ZLN5Y.gif" height="1" width="1" alt="" /><span style="color: transparent; font-size: 0; display: none; visibility: hidden; overflow: hidden; opacity: 0; width: 0; height: 0; max-width: 0; max-height: 0; mso-hide: all">Message ID: <span><openstreetmap/openstreetmap-website/pull/4978</span><span>@</span><span>github</span><span>.</span><span>com></span></span></p>
<script type="application/ld+json">[
{
"@context": "http://schema.org",
"@type": "EmailMessage",
"potentialAction": {
"@type": "ViewAction",
"target": "https://github.com/openstreetmap/openstreetmap-website/pull/4978",
"url": "https://github.com/openstreetmap/openstreetmap-website/pull/4978",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>