<p>Historically we used <code>@user</code> for the currently logged in user, but this was changed to <code>current_user</code> in <a class="issue-link js-issue-link" data-error-text="Failed to load issue title" data-id="242423704" data-permission-text="Issue title is private" data-url="https://github.com/openstreetmap/openstreetmap-website/issues/1583" href="https://github.com/openstreetmap/openstreetmap-website/pull/1583">#1583</a> <a class="issue-link js-issue-link" data-error-text="Failed to load issue title" data-id="245766398" data-permission-text="Issue title is private" data-url="https://github.com/openstreetmap/openstreetmap-website/issues/1595" href="https://github.com/openstreetmap/openstreetmap-website/pull/1595">#1595</a> and <a class="issue-link js-issue-link" data-error-text="Failed to load issue title" data-id="246134656" data-permission-text="Issue title is private" data-url="https://github.com/openstreetmap/openstreetmap-website/issues/1597" href="https://github.com/openstreetmap/openstreetmap-website/pull/1597">#1597</a>. That allows this refactoring from <code>@this_user</code> to <code>@user</code>.</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/1814'>https://github.com/openstreetmap/openstreetmap-website/pull/1814</a></p>

<h4>Commit Summary</h4>
<ul>
  <li>Refactor @this_user to @user</li>
</ul>

<h4>File Changes</h4>
<ul>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1814/files#diff-0">app/controllers/application_controller.rb</a>
    (8)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1814/files#diff-1">app/controllers/diary_entry_controller.rb</a>
    (14)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1814/files#diff-2">app/controllers/message_controller.rb</a>
    (6)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1814/files#diff-3">app/controllers/notes_controller.rb</a>
    (10)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1814/files#diff-4">app/controllers/user_blocks_controller.rb</a>
    (10)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1814/files#diff-5">app/controllers/user_controller.rb</a>
    (28)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1814/files#diff-6">app/controllers/user_roles_controller.rb</a>
    (24)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1814/files#diff-7">app/views/diary_entry/_diary_entry.html.erb</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1814/files#diff-8">app/views/diary_entry/comments.html.erb</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1814/files#diff-9">app/views/diary_entry/list.html.erb</a>
    (12)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1814/files#diff-10">app/views/user/_contact.html.erb</a>
    (4)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1814/files#diff-11">app/views/user/api_read.builder</a>
    (54)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1814/files#diff-12">app/views/user/view.html.erb</a>
    (90)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1814/files#diff-13">app/views/user_blocks/blocks_by.html.erb</a>
    (6)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1814/files#diff-14">app/views/user_blocks/blocks_on.html.erb</a>
    (6)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1814/files#diff-15">app/views/user_blocks/new.html.erb</a>
    (10)
  </li>
</ul>

<h4>Patch Links:</h4>
<ul>
  <li><a href='https://github.com/openstreetmap/openstreetmap-website/pull/1814.patch'>https://github.com/openstreetmap/openstreetmap-website/pull/1814.patch</a></li>
  <li><a href='https://github.com/openstreetmap/openstreetmap-website/pull/1814.diff'>https://github.com/openstreetmap/openstreetmap-website/pull/1814.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/1814">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/ABWnLXqrs9Px4S5qryA37HzTCF4F85CWks5tnX0OgaJpZM4TPVJS">mute the thread</a>.<img src="https://github.com/notifications/beacon/ABWnLfkqXRaEFSrkhB2la5WrfyoXW5aeks5tnX0OgaJpZM4TPVJS.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/1814"></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":"Refactor @this_user to @user (#1814)"}],"action":{"name":"View Pull Request","url":"https://github.com/openstreetmap/openstreetmap-website/pull/1814"}}}</script>