<p>This pull request updates the code to use rails 4.1.x (currently specifically 4.1.4).</p>

<p>All tests pass, and there is a test instance deployed at <a href="http://rails41.apis.dev.openstreetmap.org/">http://rails41.apis.dev.openstreetmap.org/</a> if people want to try it and see if they can spot any obvious problems.</p>

<hr>

<h4>You can merge this Pull Request by running</h4>
<pre>  git pull https://github.com/tomhughes/openstreetmap-website rails41</pre>
<p>Or view, comment on, or merge it at:</p>
<p>  <a href='https://github.com/openstreetmap/openstreetmap-website/pull/777'>https://github.com/openstreetmap/openstreetmap-website/pull/777</a></p>

<h4>Commit Summary</h4>
<ul>
  <li>Update to rails 4.1.1</li>
  <li>Rename User#public to User#identifiable</li>
  <li>Rename Trace#public to Trace#visible_to_all</li>
  <li>Update postgres connection adaptor patches</li>
  <li>Sort tags alphabetically for consistent results</li>
  <li>Make sure we restore I18n.locale when tests complete</li>
  <li>Make sure all environment can see asset precompilation rules</li>
  <li>Update for API change in CPK 7.x</li>
  <li>Don't assume we know what ID the new block will have</li>
  <li>Update to rails 4.1.4</li>
</ul>

<h4>File Changes</h4>
<ul>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/777/files#diff-0">Gemfile</a>
    (10)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/777/files#diff-1">Gemfile.lock</a>
    (141)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/777/files#diff-2">app/controllers/changeset_controller.rb</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/777/files#diff-3">app/controllers/trace_controller.rb</a>
    (6)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/777/files#diff-4">app/controllers/user_preference_controller.rb</a>
    (6)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/777/files#diff-5">app/helpers/browse_helper.rb</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/777/files#diff-6">app/models/trace.rb</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/777/files#diff-7">app/models/user.rb</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/777/files#diff-8">config.ru</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/777/files#diff-9">config/application.rb</a>
    (11)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/777/files#diff-10">config/boot.rb</a>
    (4)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/777/files#diff-11">config/environment.rb</a>
    (6)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/777/files#diff-12">config/environments/development.rb</a>
    (10)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/777/files#diff-13">config/environments/production.rb</a>
    (27)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/777/files#diff-14">config/environments/test.rb</a>
    (5)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/777/files#diff-15">config/initializers/assets.rb</a>
    (23)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/777/files#diff-16">config/initializers/cookies_serializer.rb</a>
    (3)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/777/files#diff-17">config/initializers/postgresql_adapter.rb</a>
    (4)
  </li>
  <li>
    <strong>D</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/777/files#diff-18">config/initializers/secret_token.rb</a>
    (12)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/777/files#diff-19">config/initializers/session_store.rb</a>
    (4)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/777/files#diff-20">config/secrets.yml</a>
    (22)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/777/files#diff-21">lib/migrate.rb</a>
    (68)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/777/files#diff-22">test/controllers/trace_controller_test.rb</a>
    (18)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/777/files#diff-23">test/controllers/user_blocks_controller_test.rb</a>
    (5)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/777/files#diff-24">test/controllers/user_preference_controller_test.rb</a>
    (26)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/777/files#diff-25">test/helpers/application_helper_test.rb</a>
    (4)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/777/files#diff-26">test/helpers/browse_helper_test.rb</a>
    (4)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/777/files#diff-27">test/models/trace_test.rb</a>
    (4)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/777/files#diff-28">test/models/user_test.rb</a>
    (6)
  </li>
</ul>

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

<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br>Reply to this email directly or <a href="https://github.com/openstreetmap/openstreetmap-website/pull/777">view it on GitHub</a>.<img alt="" height="1" src="https://github.com/notifications/beacon/1419053__eyJzY29wZSI6Ik5ld3NpZXM6QmVhY29uIiwiZXhwaXJlcyI6MTcyMDQ3MTA2NywiZGF0YSI6eyJpZCI6MzY1MjI3MjR9fQ==--fa203a28e8debeb8122bdd5ec4ce4a605a36b1c2.gif" width="1" /></p>