Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- README.md
  discarded upstream changes
- app/controllers/api/v1/bookmarks_controller.rb
  finally merged upstream, some code style fixes
  and slightly changed pagination code
- app/controllers/application_controller.rb
  changed upstream to always return HTML error pages
  slight conflict caused by theming code
- app/models/bookmark.rb
  finally merged upstream, no real conflict
- spec/controllers/api/v1/bookmarks_controller_spec.rb
  finally merged upstream, slightly changed pagination code

1 files changed, 1 insertions, 1 deletions

diff --git a/public/emoji/1f9d6-1f3ff-200d-2642-fe0f.svg b/public/emoji/1f9d6-1f3ff-200d-2642-fe0f.svg
index d0a9f4d71..7512a609d 100644
--- a/public/emoji/1f9d6-1f3ff-200d-2642-fe0f.svg
+++ b/public/emoji/1f9d6-1f3ff-200d-2642-fe0f.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#C1694F" d="M36 32c0 2.209-1.791 4-4 4H4c-2.209 0-4-1.791-4-4V4c0-2.209 1.791-4 4-4h28c2.209 0 4 1.791 4 4v28z"/><path fill="#D99E82" d="M0 4h36v4H0zm0 8h36v4H0zm0 8h36v4H0zm0 8h36v4H0z"/><path opacity=".75" fill="#E1E8ED" d="M33.47 15.4c-.436-.247-.933-.4-1.47-.4-1.657 0-3 1.343-3 3 0 .061.014.118.018.178-.863.301-1.539.977-1.84 1.84-.06-.004-.117-.018-.178-.018-1.311 0-2.414.846-2.822 2.018C24.118 22.014 12.657 22 11 22c-.395 0-.77.081-1.116.22-.259-.957-.974-1.718-1.902-2.041.004-.061.018-.118.018-.179 0-1.657-1.343-3-3-3-.537 0-1.034.153-1.47.4C2.998 16.561 2.067 16 1 16c-.355 0-.685.081-1 .195V32c0 2.209 1.791 4 4 4h28c2.209 0 4-1.791 4-4V14c-1.067 0-1.998.561-2.53 1.4z"/><path fill="#7C533E" d="M26 22c0-2-1.531-3-3-3h-1.975v-2h-5.929v2H13c-1.469 0-3 1-3 3v12l.024-.004c-.005.041-.024.076-.024.118 0 .615.499 1.114 1.114 1.114.615 0 1.114-.499 1.114-1.114 0-.164-.04-.317-.103-.457h11.75c-.064.14-.103.293-.103.457 0 .615.499 1.114 1.114 1.114.615 0 1.114-.499 1.114-1.114 0-.042-.019-.077-.024-.118L26 34V22z"/><path fill="#664131" d="M12.5 32c-.275 0-.5-.225-.5-.5v-8c0-.275.225-.5.5-.5s.5.225.5.5v8c0 .275-.225.5-.5.5zm11 0c-.275 0-.5-.225-.5-.5v-8c0-.275.225-.5.5-.5s.5.225.5.5v8c0 .275-.225.5-.5.5z"/><path fill="#77B255" d="M12 29h12v7H12z"/><path fill="#5C913B" d="M18 29h-6v1h7.121c-.277-.402-.64-.76-1.121-1z"/><path fill="#A6D388" d="M23 36h-4v-3s0-3-2-4h6v7z"/><path fill="#5C913B" d="M24 36h-4v-3s0-3-2-4h6v7z"/><path fill="#77B255" d="M18.121 30h1c-.277-.402-.64-.76-1.121-1h-1c.481.24.844.598 1.121 1z"/><path fill="#3E721D" d="M18 29c.481.24.844.598 1.121 1H24v-1h-6z"/><path fill="#664131" d="M21.025 16.972L15.096 17v1.553s2.965 1.482 5.929 0v-1.581z"/><path fill="#7C533E" d="M24.356 6h-12.59v6.147c0 3.478 2.818 6.295 6.295 6.295s6.295-2.817 6.295-6.295V6z"/><path fill="#3D2E24" d="M20.579 15.923h-5.036s0 1.259 2.518 1.259 2.518-1.259 2.518-1.259z"/><circle cx="14.913" cy="11.517" r=".629"/><circle cx="21.208" cy="11.517" r=".629"/><path fill="#3D2E24" d="M16.802 13.405h2.518s0 1.259-1.259 1.259-1.259-1.259-1.259-1.259z"/><path fill="#0B0200" d="M18 2c4.328 0 7.033 3.221 7.033 5.905s-.541 3.758-1.082 2.684l-1.082-2.147s-3.246 0-4.328-1.074c0 0 1.623 3.221-1.623 0 0 0 .541 2.148-2.705-.536 0 0-1.623 1.074-2.164 3.757-.15.745-1.082 0-1.082-2.684S13.131 2 18 2"/><path d="M0 32c0 2.209 1.791 4 4 4h12.816c.112-.314.184-.647.184-1 0-1.657-1.343-3-3-3-.36 0-.7.074-1.019.19.004-.064.019-.125.019-.19 0-1.067-.561-1.998-1.4-2.53.247-.436.4-.933.4-1.47 0-1.657-1.343-3-3-3-.781 0-1.487.306-2.021.796C6.872 24.236 5.587 23 4 23c-1.385 0-2.539.944-2.884 2.22C.77 25.081.395 25 0 25v7zm34-7c-.87 0-1.646.376-2.194.967C31.384 24.821 30.292 24 29 24c-1.657 0-3 1.343-3 3-1.657 0-3 1.343-3 3 0 .537.153 1.034.4 1.47-.839.532-1.4 1.463-1.4 2.53-1.304 0-2.403.837-2.816 2H32c2.209 0 4-1.791 4-4v-6.221C35.468 25.3 34.772 25 34 25z" opacity=".85" fill="#F5F8FA"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><g fill="#E1E8ED"><circle cx="4.5" cy="25.5" r="4.5"/><circle cx="25.5" cy="20.5" r="5.5"/><circle cx="31" cy="26.5" r="5"/><circle cx="12" cy="24" r="5"/><path d="M33 30c-1.657 0-3 1.343-3 3H6c0-1.657-1.343-3-3-3s-3 1.343-3 3 1.343 3 3 3h29v-.184c.314.112.647.184 1 .184 1.657 0 3-1.343 3-3s-1.343-3-3-3z"/><path d="M0 25.5h9V33H0zM20 23h9v4h-9zm11 3.5h5V33h-5z"/></g><path d="M23.35 20c1.014.324 2.845 1.15 2.65 2.941 1.924.357 2.306 1.966 2.436 2.907.248 1.79-7.436-.198-7.436-.198l-1-3.482L23.35 20zm-10.38.5c-.769.185-2.749.5-3.64 2.793-1.99 0-2.33 2.02-2.33 3.538 0 2.253 7.336 1.955 8.495.678 1.158-1.277.784-5.36.784-5.36L12.97 20.5z" fill="#77B255"/><path fill="#7C533E" d="M32 36v-4c0-3.314-2.685-6-6-6H10c-3.313 0-6 2.686-6 6v4h28z"/><path fill="#7C533E" d="M13.667 27.122L18 31.001l4.316-2.627L22 22h-8z"/><path fill="#664131" d="M14 24c1.216 1.374 2.355 1.719 3.996 1.719 1.639 0 2.787-.346 4.004-1.719v-4h-8v4z"/><path fill="#7C533E" d="M11.444 13.936c0 1.448-.734 2.622-1.639 2.622s-1.639-1.174-1.639-2.622.734-2.623 1.639-2.623c.905-.001 1.639 1.174 1.639 2.623m16.389 0c0 1.448-.733 2.622-1.639 2.622-.905 0-1.639-1.174-1.639-2.622s.733-2.623 1.639-2.623c.906-.001 1.639 1.174 1.639 2.623"/><path fill="#7C533E" d="M9.477 14.96c0-5.589 3.816-10.121 8.523-10.121s8.522 4.532 8.522 10.121S22.707 25.081 18 25.081c-4.707-.001-8.523-4.532-8.523-10.121"/><path fill="#3D2E24" d="M18 21.802c-2.754 0-3.6-.705-3.741-.848-.256-.256-.256-.671 0-.927.248-.248.646-.255.902-.023.052.037.721.487 2.839.487 2.2 0 2.836-.485 2.842-.49.256-.255.657-.243.913.015.256.256.242.683-.014.938-.141.143-.987.848-3.741.848"/><path fill="#0B0200" d="M18 1.48c5.648 0 9.178 4.168 9.178 7.641s-.706 4.863-1.412 3.473l-1.412-2.778s-4.235 0-5.647-1.39c0 0 2.118 4.168-2.118 0 0 0 .706 2.779-3.53-.694 0 0-2.118 1.389-2.824 4.862-.196.964-1.412 0-1.412-3.473C8.822 5.648 11.646 1.48 18 1.48"/><path d="M14 15c-.55 0-1-.45-1-1v-1c0-.55.45-1 1-1s1 .45 1 1v1c0 .55-.45 1-1 1m8 0c-.55 0-1-.45-1-1v-1c0-.55.45-1 1-1s1 .45 1 1v1c0 .55-.45 1-1 1"/><path fill="#3D2E24" d="M18.75 17.75h-1.5c-.413 0-.75-.337-.75-.75s.337-.75.75-.75h1.5c.413 0 .75.337.75.75s-.337.75-.75.75"/><path fill="#77B255" d="M13.758 25.712c-.269 3.395.314 5.641.636 6.672.158.505-.201 1.016-.729 1.045-.714.039-1.591.08-2.116.08-1 0-3.477 2.243-3.942-.193C7.143 30.88 7 28.711 7 27.909s-.158-3.166 1.167-3.17c1.817-.005 2.155-.153 2.917-.705.857-.622 2.738.879 2.674 1.678zm8.426.007c.247 3.305-.257 5.437-.553 6.44-.145.492-.261.897.099 1.237.698.66 2.007-.07 2.49-.07.92 0 2.935 2.261 3.612-.991.633-3.039.604-5.475.604-6.255s-.468-1.038-1.077-1.363c-1.486-.792-1.982-.149-2.683-.687-.788-.605-2.55.911-2.492 1.689z"/><path fill="#A6D388" d="M8.002 25.236c.156-.67.885-1.175 1.063-.623.177.55.233 3.471.295 4.387s-.608-.184-.861-.898c-.254-.714-.644-2.234-.497-2.866zm19.115-.849c-.175-.579-.846-.279-1.003.176s.021 1.692-.01 2.465c-.031.773.325.014.551-.574.227-.588.627-1.521.462-2.067zm-16.802-.852c.024-.521.923-1.192 1.004-.656.081.536.571 6.09.845 7.289.274 1.199-.196.978-.522.124s-1.401-5.186-1.327-6.757zm14.802-.853c-.245-.141-.842.207-.89.639-.047.432-.005 4.021-.202 4.982-.196.961.115.81.383.133s1.831-5.106.709-5.754z"/><path d="M32 28c-2.975 0-5.438 2.168-5.911 5.009C26.058 33.008 26.03 33 26 33c-2.049 0-3.806 1.236-4.578 3H33c1.65 0 3-1.35 3-3v-3.463C34.938 28.584 33.539 28 32 28zm-18.422 8c-.772-1.764-2.529-3-4.578-3-.78 0-1.509.194-2.166.512.098-.322.166-.657.166-1.012C7 30.567 5.433 29 3.5 29 1.738 29 .295 30.306.05 32H0v1c0 1.65 1.35 3 3 3h10.578z" opacity=".7" fill="#FFF"/></svg>
\ No newline at end of file