<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/4105'>https://github.com/openstreetmap/openstreetmap-website/pull/4105</a></p>

<h4>Commit Summary</h4>
<ul>
  <li><a href="https://github.com/openstreetmap/openstreetmap-website/pull/4105/commits/1401a96b1537d8f3dc75a873cac549d0fe265e62" class="commit-link">1401a96</a>  switch to aquagis</li>
  <li><a href="https://github.com/openstreetmap/openstreetmap-website/pull/4105/commits/84c4537f30d7a4028913aa6019424e0974bfb11a" class="commit-link">84c4537</a>  rename openstreetmap to aquagis</li>
  <li><a href="https://github.com/openstreetmap/openstreetmap-website/pull/4105/commits/56441956981f3aa88086a2b8faee703b0a301957" class="commit-link">5644195</a>  rename openstreetmap to aquagis</li>
  <li><a href="https://github.com/openstreetmap/openstreetmap-website/pull/4105/commits/3f17f5c3ac9184b0526d5efb8d7de1008db716fa" class="commit-link">3f17f5c</a>  rename openstreetmap to aquagis</li>
  <li><a href="https://github.com/openstreetmap/openstreetmap-website/pull/4105/commits/c34cad3a3b98e829566622342bebbdbfbb80bf6b" class="commit-link">c34cad3</a>  add new script in scripts</li>
  <li><a href="https://github.com/openstreetmap/openstreetmap-website/pull/4105/commits/f18a4488340011030a35f735985d669263298f8a" class="commit-link">f18a448</a>  app edits</li>
  <li><a href="https://github.com/openstreetmap/openstreetmap-website/pull/4105/commits/5b384714ddf5b5abe6d590f94b6f4f903f104481" class="commit-link">5b38471</a>  config edits</li>
  <li><a href="https://github.com/openstreetmap/openstreetmap-website/pull/4105/commits/173dabd436bad829ff8904a53b90b9d2c793c860" class="commit-link">173dabd</a>  add Gemfile.lock to .gitignore</li>
  <li><a href="https://github.com/openstreetmap/openstreetmap-website/pull/4105/commits/e026a4e2e63a94802340e117baeb4c2476b95361" class="commit-link">e026a4e</a>  untrack Gemfile.lock</li>
  <li><a href="https://github.com/openstreetmap/openstreetmap-website/pull/4105/commits/dc98d6dd19af47263bb8d736785fe9a150b615bf" class="commit-link">dc98d6d</a>  untrack .bundle and db/structure.sql</li>
  <li><a href="https://github.com/openstreetmap/openstreetmap-website/pull/4105/commits/89dce242f8655b85b8190b21f83d48f59d6e774b" class="commit-link">89dce24</a>  untrack structure.sql</li>
  <li><a href="https://github.com/openstreetmap/openstreetmap-website/pull/4105/commits/e3badc94d774db9fdf7dcdaabcecfea686864a31" class="commit-link">e3badc9</a>  add config/database.yml to git</li>
  <li><a href="https://github.com/openstreetmap/openstreetmap-website/pull/4105/commits/5f71deeaebadd44f900b83fef99f296585a5abb4" class="commit-link">5f71dee</a>  add base configs</li>
  <li><a href="https://github.com/openstreetmap/openstreetmap-website/pull/4105/commits/9ca646c33a31553b47c0332b3d5df590ac3a66c5" class="commit-link">9ca646c</a>  Changed to use @import</li>
  <li><a href="https://github.com/openstreetmap/openstreetmap-website/pull/4105/commits/610802ac5a80ea3ba1465b5064acdf7b78d6fec5" class="commit-link">610802a</a>  Backup the original docker files</li>
  <li><a href="https://github.com/openstreetmap/openstreetmap-website/pull/4105/commits/744fbb154f6c1c2fd23c31d8ccaf5220c6a3c0f7" class="commit-link">744fbb1</a>  Updated docker files</li>
</ul>

<h4 style="display: inline-block">File Changes </h4> <p style="display: inline-block">(<a href="https://github.com/openstreetmap/openstreetmap-website/pull/4105/files">39 files</a>)</p>
<ul>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/4105/files#diff-bc37d034bad564583790a46f19d807abfe519c5671395fd494d8cce506c42947">.gitignore</a>
    (5)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/4105/files#diff-dd2c0eb6ea5cfc6c4bd4eac30934e2d5746747af48fef6da689e85b752f39557">Dockerfile</a>
    (16)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/4105/files#diff-9069889d5d3558d324726440410b6981dde49d9ef40ab04278de32ed78066a3d">Dockerfile-original</a>
    (51)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/4105/files#diff-89cade48462044ee1b672dc5f4c3ec250fbd29effcd8932096a23c1283c6731f">Gemfile.lock</a>
    (92)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/4105/files#diff-1ea02434f746b6d1522cdef3d4a56e57cf2d5a72c5273927746a71eaf06d74fd">Vagrantfile</a>
    (13)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/4105/files#diff-97d92457f6d9fdf1f937ddfe97aad5f7313ac0cee8894400f984d86f9dfa462c">Vendorfile</a>
    (10)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/4105/files#diff-9ea58a8ca792a67a03855e43d50801951a64a132c9dedfcd46e32e08803ea390">app/assets/favicons/manifest.json.erb</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/4105/files#diff-8c15a01c0063fe88fd9f5197128e788856295e4755fbb4a3cbf7aa6be9f81ca7">app/assets/javascripts/embed.js.erb</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/4105/files#diff-3d94871c01d8afc9f7f008c3a85821d898ebdf79bce860d0b49f31e9caa72162">app/assets/stylesheets/ltr/common.scss</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/4105/files#diff-aededcaee19eedd12c28424c3618cfbe00d53d519feab8914cacbd92cb552d09">app/assets/stylesheets/ltr/small.scss</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/4105/files#diff-e33751e4e8d1572cce5dad0954619847a134a1473bf928936868eeac0919550c">app/assets/stylesheets/rtl/common.r2.scss</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/4105/files#diff-757eaf0eb4af3cc3243aa1b416a794dafa2c0935ae3de9aaf08572a2ee06e3a0">app/assets/stylesheets/rtl/small.r2.scss</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/4105/files#diff-19869328a2527e48402e7511953ee1aff338d652f6e8b4c40a8f4c684250ba28">app/controllers/api/tracepoints_controller.rb</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/4105/files#diff-766c34fd6533171eaf54300c153f89d6002c35c02cfc9c5b219251f85180ad07">app/controllers/application_controller.rb</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/4105/files#diff-bf845b955a0aeb626484399330d9c39183e734c9a56a3900e71fa48b0da47f81">app/controllers/geocoder_controller.rb</a>
    (4)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/4105/files#diff-684a16c1b0b4c099fcdfeed95b1820e11fef629fe332ec7ce6a8c600331dd06d">app/models/message.rb</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/4105/files#diff-200bd263976449f418184505d5ee94a9c4e5c1e6f35899175df4768a91aa6a1d">app/views/api/notes/index.gpx.builder</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/4105/files#diff-e0194ac190ca91dd2eda94f64304b6e9b305140ad0550762b4996358dac2ad43">app/views/api/notes/show.gpx.builder</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/4105/files#diff-0043e76d62c655a0fc97fc2e83380ce0db3653b50af44f3a65e188dd7103a3e4">app/views/errors/forbidden.html.erb</a>
    (4)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/4105/files#diff-c83b4374f45b8fda8fd7d492205d6f422ca9d846f2c007ed02027238ecc17e4f">app/views/errors/internal_server_error.html.erb</a>
    (4)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/4105/files#diff-3322048370e2b4f6e410155cbe136862ada3a168c5e444b0f30cc3ca0260e6ea">app/views/errors/not_found.html.erb</a>
    (4)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/4105/files#diff-10a0a3e65ad49cb7711a30d403d504f9ac13721a6d31445a9b8d71df467ffe1e">app/views/export/embed.html.erb</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/4105/files#diff-b3aa1d88647a55c139237705e584a32ca1962ba65e0e1b55b714fcc2b8e9c2fb">app/views/layouts/_meta.html.erb</a>
    (4)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/4105/files#diff-32662374155481d62f434c2617848b7d00825d0e4ea6e85d3a274dd82cc710d3">app/views/layouts/error.html.erb</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/4105/files#diff-eaeaf6b733bc454c8c41be224e85cdca90bc6e0e5bc1f02f9f86315cfc6fafab">app/views/layouts/map.html.erb</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/4105/files#diff-110844e9466003ad42a36dcb2dd283878e871230e8d0247bd7da37688c97e407">app/views/layouts/user_mailer.html.erb</a>
    (6)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/4105/files#diff-20b1b4068a14bbb692bf60b143f2cd17d495893dbd397e41eadeb732056341d7">app/views/site/about.html.erb</a>
    (4)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/4105/files#diff-db1600b3df800c073c8d2ff04b1f5042902abcb20b0a55729ddeca8d23012ea5">app/views/site/export.html.erb</a>
    (10)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/4105/files#diff-5a674c769541a71f2471a45c0e9dde911b4455344e3131bddc5a363701ba6325">config/database.yml</a>
    (31)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/4105/files#diff-c8f1ef8be12ee9aff9ad3409602504f5298b02b24641451941d9ce9b298662d1">config/docker.database.yml</a>
    (12)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/4105/files#diff-dacd3aa5fc21c3eac126e41162f5108586a47e8cfda3ceebf2d579627c755255">config/github.database.yml</a>
    (2)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/4105/files#diff-999da26d39f51ab17912bf343e826c73f8dcc407010492723567cd066a8467d0">config/settings.local.yml</a>
    (0)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/4105/files#diff-e769bbb8c1ba3711c5403b424ed9c218ffafba7f1890ee394717196f28ff4540">config/settings.yml</a>
    (20)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/4105/files#diff-188abe2a4493506d81577fbbee0b279b889e59f50d509402fbbfb620c8e58780">config/storage.yml</a>
    (7)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/4105/files#diff-1dd5a8f580b9615769ddc19a64a98f455d9d20eb149c443f41d9d3c797d39b12">db/structure.sql</a>
    (56)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/4105/files#diff-083ea8f7fef48b12f1ce9ed02a32efb29b3070dc092cbd3ec659ec0a2353cc10">docker-compose-original.yml</a>
    (37)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/4105/files#diff-e45e45baeda1c1e73482975a664062aa56f20c03dd9d64a827aba57775bed0d3">docker-compose.yml</a>
    (30)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/4105/files#diff-faac2c7f09bce3fe21ab19bb44642441e70cbf923e3091c97de565ed97f374d9">script/aquagis/aquagis_server_setup.sh</a>
    (26)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/4105/files#diff-dcd17c18ef06dc1c5c49caa05ecb7aabc1230dbc967d7e4e2bf1e3e51c06a9b1">script/vagrant/setup/provision.sh</a>
    (31)
  </li>
</ul>

<h4>Patch Links:</h4>
<ul>
  <li><a href='https://github.com/openstreetmap/openstreetmap-website/pull/4105.patch'>https://github.com/openstreetmap/openstreetmap-website/pull/4105.patch</a></li>
  <li><a href='https://github.com/openstreetmap/openstreetmap-website/pull/4105.diff'>https://github.com/openstreetmap/openstreetmap-website/pull/4105.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/4105">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AAK2OLKWZO44GXWLWQWRI6DXSCSCHANCNFSM6AAAAAA2YAX3TM">unsubscribe</a>.<br />You are receiving this because you are subscribed to this thread.<img src="https://github.com/notifications/beacon/AAK2OLNC4IPM6II5SH4YIZLXSCSCHA5CNFSM6AAAAAA2YAX3TOWGG33NNVSW45C7OR4XAZNFJFZXG5LFVJRW63LNMVXHIX3JMTHGZE3DUA.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/4105</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/4105",
"url": "https://github.com/openstreetmap/openstreetmap-website/pull/4105",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>