<p>This PR pulls in three of the rubocop-related changes from the Ruby For Good refactoring PR (<a class="issue-link js-issue-link" data-error-text="Failed to load issue title" data-id="337031606" data-permission-text="Issue title is private" data-url="https://github.com/openstreetmap/openstreetmap-website/issues/1918" href="https://github.com/openstreetmap/openstreetmap-website/pull/1918">#1918</a>). One of them was already fixed in the meantime.</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/1987'>https://github.com/openstreetmap/openstreetmap-website/pull/1987</a></p>

<h4>Commit Summary</h4>
<ul>
  <li>Resolve 96 Rubocop Lint/AmbiguousRegexpLiteral conflicts</li>
  <li>Remove Lint/ShadowingOuterLocalVariable - already fixed</li>
  <li>Resolve 34 Rubocop Lint/AmbiguousOperator conflicts</li>
</ul>

<h4>File Changes</h4>
<ul>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1987/files#diff-0">.rubocop_todo.yml</a>
    (17)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1987/files#diff-1">app/helpers/notifier_helper.rb</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1987/files#diff-2">test/controllers/amf_controller_test.rb</a>
    (62)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1987/files#diff-3">test/controllers/changeset_controller_test.rb</a>
    (12)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1987/files#diff-4">test/controllers/diary_entry_controller_test.rb</a>
    (4)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1987/files#diff-5">test/controllers/messages_controller_test.rb</a>
    (4)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1987/files#diff-6">test/controllers/old_node_controller_test.rb</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1987/files#diff-7">test/controllers/redactions_controller_test.rb</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1987/files#diff-8">test/controllers/swf_controller_test.rb</a>
    (6)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1987/files#diff-9">test/controllers/traces_controller_test.rb</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1987/files#diff-10">test/controllers/user_controller_test.rb</a>
    (46)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1987/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/1987/files#diff-12">test/lib/bounding_box_test.rb</a>
    (4)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1987/files#diff-13">test/lib/country_test.rb</a>
    (6)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1987/files#diff-14">test/models/changeset_test.rb</a>
    (12)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1987/files#diff-15">test/models/message_test.rb</a>
    (4)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1987/files#diff-16">test/models/node_test.rb</a>
    (38)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1987/files#diff-17">test/models/old_node_test.rb</a>
    (4)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1987/files#diff-18">test/models/relation_test.rb</a>
    (22)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1987/files#diff-19">test/models/tracepoint_test.rb</a>
    (4)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1987/files#diff-20">test/models/way_test.rb</a>
    (22)
  </li>
</ul>

<h4>Patch Links:</h4>
<ul>
  <li><a href='https://github.com/openstreetmap/openstreetmap-website/pull/1987.patch'>https://github.com/openstreetmap/openstreetmap-website/pull/1987.patch</a></li>
  <li><a href='https://github.com/openstreetmap/openstreetmap-website/pull/1987.diff'>https://github.com/openstreetmap/openstreetmap-website/pull/1987.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/1987">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/ABWnLSl75gFNo-Q68yiVX87CuDM4pShyks5uZgT_gaJpZM4WgxrO">mute the thread</a>.<img src="https://github.com/notifications/beacon/ABWnLeGi-nollnzeub10a52s59e58xArks5uZgT_gaJpZM4WgxrO.gif" height="1" width="1" alt="" /></p>
<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://assets-cdn.github.com/images/email/message_cards/header.png","avatar_image_url":"https://assets-cdn.github.com/images/email/message_cards/avatar.png","action":{"name":"Open in GitHub","url":"https://github.com/openstreetmap/openstreetmap-website"}},"updates":{"snippets":[{"icon":"DESCRIPTION","message":"Selected rubocop changes (ruby for good) (#1987)"}],"action":{"name":"View Pull Request","url":"https://github.com/openstreetmap/openstreetmap-website/pull/1987"}}}</script>
<script type="application/ld+json">[
{
"@context": "http://schema.org",
"@type": "EmailMessage",
"potentialAction": {
"@type": "ViewAction",
"target": "https://github.com/openstreetmap/openstreetmap-website/pull/1987",
"url": "https://github.com/openstreetmap/openstreetmap-website/pull/1987",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
},
{
"@type": "MessageCard",
"@context": "http://schema.org/extensions",
"hideOriginalBody": "false",
"originator": "AF6C5A86-E920-430C-9C59-A73278B5EFEB",
"title": "Selected rubocop changes (ruby for good) (#1987)",
"sections": [
{
"text": "",
"activityTitle": "**Andy Allan**",
"activityImage": "https://assets-cdn.github.com/images/email/message_cards/avatar.png",
"activitySubtitle": "@gravitystorm",
"facts": [

]
},
{
"title": "Commit Summary",
"facts": [
{
"name": "a182820",
"value": "Resolve 96 Rubocop Lint/AmbiguousRegexpLiteral conflicts"
},
{
"name": "cf107bc",
"value": "Remove Lint/ShadowingOuterLocalVariable - already fixed"
},
{
"name": "1d2a384",
"value": "Resolve 34 Rubocop Lint/AmbiguousOperator conflicts"
}
]
},
{
"title": "File Changes",
"facts": [
{
"name": "Modified",
"value": "[.rubocop_todo.yml](https://github.com/openstreetmap/openstreetmap-website/pull/1987/files#diff-0) (17 changes)"
},
{
"name": "Modified",
"value": "[app/helpers/notifier_helper.rb](https://github.com/openstreetmap/openstreetmap-website/pull/1987/files#diff-1) (2 changes)"
},
{
"name": "Modified",
"value": "[test/controllers/amf_controller_test.rb](https://github.com/openstreetmap/openstreetmap-website/pull/1987/files#diff-2) (62 changes)"
},
{
"name": "Modified",
"value": "[test/controllers/changeset_controller_test.rb](https://github.com/openstreetmap/openstreetmap-website/pull/1987/files#diff-3) (12 changes)"
},
{
"name": "Modified",
"value": "[test/controllers/diary_entry_controller_test.rb](https://github.com/openstreetmap/openstreetmap-website/pull/1987/files#diff-4) (4 changes)"
},
{
"name": "Modified",
"value": "[test/controllers/messages_controller_test.rb](https://github.com/openstreetmap/openstreetmap-website/pull/1987/files#diff-5) (4 changes)"
},
{
"name": "Modified",
"value": "[test/controllers/old_node_controller_test.rb](https://github.com/openstreetmap/openstreetmap-website/pull/1987/files#diff-6) (2 changes)"
},
{
"name": "Modified",
"value": "[test/controllers/redactions_controller_test.rb](https://github.com/openstreetmap/openstreetmap-website/pull/1987/files#diff-7) (2 changes)"
},
{
"name": "Modified",
"value": "[test/controllers/swf_controller_test.rb](https://github.com/openstreetmap/openstreetmap-website/pull/1987/files#diff-8) (6 changes)"
},
{
"name": "Modified",
"value": "[test/controllers/traces_controller_test.rb](https://github.com/openstreetmap/openstreetmap-website/pull/1987/files#diff-9) (2 changes)"
},
{
"name": "Modified",
"value": "[test/controllers/user_controller_test.rb](https://github.com/openstreetmap/openstreetmap-website/pull/1987/files#diff-10) (46 changes)"
},
{
"name": "Modified",
"value": "[test/integration/user_creation_test.rb](https://github.com/openstreetmap/openstreetmap-website/pull/1987/files#diff-11) (2 changes)"
},
{
"name": "Modified",
"value": "[test/lib/bounding_box_test.rb](https://github.com/openstreetmap/openstreetmap-website/pull/1987/files#diff-12) (4 changes)"
},
{
"name": "Modified",
"value": "[test/lib/country_test.rb](https://github.com/openstreetmap/openstreetmap-website/pull/1987/files#diff-13) (6 changes)"
},
{
"name": "Modified",
"value": "[test/models/changeset_test.rb](https://github.com/openstreetmap/openstreetmap-website/pull/1987/files#diff-14) (12 changes)"
},
{
"name": "Modified",
"value": "[test/models/message_test.rb](https://github.com/openstreetmap/openstreetmap-website/pull/1987/files#diff-15) (4 changes)"
},
{
"name": "Modified",
"value": "[test/models/node_test.rb](https://github.com/openstreetmap/openstreetmap-website/pull/1987/files#diff-16) (38 changes)"
},
{
"name": "Modified",
"value": "[test/models/old_node_test.rb](https://github.com/openstreetmap/openstreetmap-website/pull/1987/files#diff-17) (4 changes)"
},
{
"name": "Modified",
"value": "[test/models/relation_test.rb](https://github.com/openstreetmap/openstreetmap-website/pull/1987/files#diff-18) (22 changes)"
},
{
"name": "Modified",
"value": "[test/models/tracepoint_test.rb](https://github.com/openstreetmap/openstreetmap-website/pull/1987/files#diff-19) (4 changes)"
},
{
"name": "Modified",
"value": "[test/models/way_test.rb](https://github.com/openstreetmap/openstreetmap-website/pull/1987/files#diff-20) (22 changes)"
}
]
}
],
"potentialAction": [
{
"name": "Add a comment",
"@type": "ActionCard",
"inputs": [
{
"isMultiLine": true,
"@type": "TextInput",
"id": "IssueComment",
"isRequired": false
}
],
"actions": [
{
"name": "Comment",
"@type": "HttpPOST",
"target": "https://api.github.com",
"body": "{\n\"commandName\": \"IssueComment\",\n\"repositoryFullName\": \"openstreetmap/openstreetmap-website\",\n\"issueId\": 1987,\n\"IssueComment\": \"{{IssueComment.value}}\"\n}"
}
]
},
{
"name": "Close pull request",
"@type": "HttpPOST",
"target": "https://api.github.com",
"body": "{\n\"commandName\": \"PullRequestClose\",\n\"repositoryFullName\": \"openstreetmap/openstreetmap-website\",\n\"pullRequestId\": 1987\n}"
},
{
"targets": [
{
"os": "default",
"uri": "https://github.com/openstreetmap/openstreetmap-website/pull/1987"
}
],
"@type": "OpenUri",
"name": "View on GitHub"
},
{
"targets": [
{
"os": "default",
"uri": "https://github.com/openstreetmap/openstreetmap-website/pull/1987.patch"
}
],
"@type": "OpenUri",
"name": "View patch"
},
{
"targets": [
{
"os": "default",
"uri": "https://github.com/openstreetmap/openstreetmap-website/pull/1987.diff"
}
],
"@type": "OpenUri",
"name": "View diff"
},
{
"name": "Unsubscribe",
"@type": "HttpPOST",
"target": "https://api.github.com",
"body": "{\n\"commandName\": \"MuteNotification\",\n\"threadId\": 377690830\n}"
}
],
"themeColor": "26292E"
}
]</script>