<p>It was merged, it's just that github doesn't recognise it as such. Your commit is in master though, under your name, just with the warnings fixed.</p>
<p>All I did was to cherry pick your commit to master, run <code>rubocop --auto-correct</code> and then <code>git commit -a --amend</code> to update the commit. I added the fixes and closes markers to the commit message so that github would see them and close the tickets.</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/1840#issuecomment-384540315">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/ABWnLcrFh5MC8BYItFnWcZAnpJ5OKNkOks5tsXXzgaJpZM4TkCbn">mute the thread</a>.<img src="https://github.com/notifications/beacon/ABWnLY2Y1zDOZqQtZxu7_7wQIgEmhttrks5tsXXzgaJpZM4TkCbn.gif" height="1" width="1" alt="" /></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/1840#issuecomment-384540315"></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 in #1840: It was merged, it's just that github doesn't recognise it as such. Your commit is in master though, under your name, just with the warnings fixed.\r\n\r\nAll I did was to cherry pick your commit to master, run `rubocop --auto-correct` and then `git commit -a --amend` to update the commit. I added the fixes and closes markers to the commit message so that github would see them and close the tickets."}],"action":{"name":"View Pull Request","url":"https://github.com/openstreetmap/openstreetmap-website/pull/1840#issuecomment-384540315"}}}</script>