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/1f3c4-1f3fe.svg b/public/emoji/1f3c4-1f3fe.svg
index dda836ca5..147c45aea 100644
--- a/public/emoji/1f3c4-1f3fe.svg
+++ b/public/emoji/1f3c4-1f3fe.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#4289C1" d="M36 5v27s0 4-4 4H4c-4 0-4-4-4-4v-5s25-2 36-22z"/><path fill="#A7D28B" d="M30.59 20.432s2.33-2.136 1.924-3.049c-.408-.914-11.676.831-17.154 3.276-8.22 3.669-12.068 9.767-11.253 11.593.815 1.826 7.925 3.033 16.143-.635 5.48-2.445 14.301-9.669 13.895-10.582-.409-.913-3.555-.603-3.555-.603z"/><path fill="#F5F8FA" d="M34.145 21.035c-.408-.913-3.555-.604-3.555-.604s2.204-2.024 1.942-2.973L4.612 29.674c-.569 1.116-.747 2.037-.505 2.578.211.473.849.9 1.812 1.217l28.215-12.345c0-.027.02-.068.011-.089z"/><path fill="#AF7E57" d="M24.408 15c-3.401 0-6.462-3.95-6.8-4.4-.332-.441-.242-1.067.199-1.399.441-.331 1.066-.244 1.4.198.754 1.002 3.158 3.601 5.2 3.601.553 0 1 .448 1 1s-.446 1-.999 1zm-17 4c-.419 0-.809-.265-.949-.684-1.195-3.584.152-5.934 1.492-7.273 1.401-1.401 3.07-1.968 3.141-1.992.525-.176 1.091.109 1.265.632.174.523-.107 1.088-.629 1.264-.516.176-4.996 1.861-3.371 6.736.175.524-.108 1.091-.632 1.265-.105.035-.212.052-.317.052z"/><path fill="#67757F" d="M25.406 26c-.3 0-.605-.067-.893-.211l-2-1c-.439-.22-.78-.592-.963-1.046l-1.682-4.204-4.204-1.682c-1.025-.41-1.524-1.574-1.114-2.6.41-1.026 1.576-1.525 2.6-1.114l5.001 2c.508.203.91.606 1.114 1.114l1.717 4.294 1.32.66c.988.494 1.389 1.695.895 2.684-.35.701-1.056 1.105-1.791 1.105z"/><path fill="#67757F" d="M16.409 30c-.733.001-1.44-.404-1.791-1.105l-1-2c-.199-.397-.259-.851-.172-1.287l.848-4.241-2.602-4.337c-.568-.947-.261-2.175.686-2.744.946-.569 2.175-.261 2.744.686l3 4.999c.256.427.344.934.246 1.422l-.865 4.327.693 1.386c.494.988.093 2.189-.895 2.684-.286.143-.591.21-.892.21z"/><path fill="#AF7E57" d="M14.755.763c-1.678-.66-4.294.192-4.598 2.152-.302 1.947.252 5 1.962 4.816 1.793-.194 3.632-.584 4.359-2.43.727-1.846-.045-3.878-1.723-4.538z"/><path fill="#AF7E57" d="M16.002 5.776c2.442-2.869-3.441-2.589-3.441-2.589-1.113.04-.347 1.895-.871 2.908-.359.701 1.153 1.073 1.153 1.073s.694-.01.732.832v.008c.008.214-.014.469-.114.81-.498 1.686 1.766 2.72 2.264 1.03.197-.669.12-1.257.021-1.799L15.736 8c-.151-.807-.338-1.514.266-2.224z"/><path fill="#67757F" d="M18.408 8h-2.672l-.751.766L13.56 8h-2.152c-1.104 0-2 .896-2 2s.896 2 2 2v3.5c0 1.933 1.567 3.5 3.5 3.5s3.5-1.567 3.5-3.5V12c1.104 0 2-.896 2-2s-.895-2-2-2z"/><path fill="#60352A" d="M16.673 1.439C15.556.131 14.019-.412 11.386.606c-2.299.889-1.439 2.865-1.024 2.404.661-.734 1.555-.509 1.555-.509l.695 2.048s.331.199.469-.498c.138-.696 1.072-.768 1.378-.208.476.87-.147 1.037-.204 1.557-.179 1.645 1.643 1.582 1.643 1.582s.355.14.961-1.055c.606-1.192.923-3.189-.186-4.488z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#4289C1" d="M36 5v27s0 4-4 4H4c-4 0-4-4-4-4v-5s25-2 36-22z"/><path fill="#1C6399" d="M31.844 23.243s2.565-1.635 2.258-2.288c-.309-.654-11.778.99-17.528 2.954-8.627 2.947-13.144 7.522-12.526 8.828.617 1.306 7.602 1.953 16.228-.993 5.752-1.964 15.368-7.524 15.06-8.177-.309-.653-3.492-.324-3.492-.324z"/><path fill="#A6D388" d="M31.474 22.747s2.65-1.619 2.349-2.291c-.303-.673-12.042.782-17.949 2.675C7.01 25.972 2.311 30.555 2.916 31.9c.605 1.345 7.723 2.141 16.585-.699 5.91-1.893 15.833-7.383 15.532-8.055-.303-.673-3.559-.399-3.559-.399z"/><path fill="#F5F8FA" d="M31.474 22.747s2.507-1.534 2.358-2.235L3.756 29.978c-.722.837-1.019 1.523-.84 1.922.156.348.755.657 1.7.878l30.395-9.566c.003-.02.029-.051.022-.066-.303-.673-3.559-.399-3.559-.399z"/><path fill="#AF7E57" d="M2.789 15.057c-.354.166-1.458.438-1.992.781-.432.278-.845.262-.727.612.102.302.508.216 1.227.132.719-.084 1.929-.289 2.325-.566l-.833-.959zm22.862-3.211c.379.095 1.515.151 2.104.386.477.19 1.122.088 1.073.455-.043.316-.701.317-1.422.371-.722.054-1.949.085-2.39-.113l.635-1.099zM14.698.997c-1.593-.627-4.077.182-4.365 2.043-.287 1.848.239 4.747 1.863 4.572 1.702-.184 3.448-.554 4.138-2.307.69-1.752-.043-3.681-1.636-4.308z"/><path fill="#AF7E57" d="M15.882 5.757c2.318-2.723-3.266-2.458-3.266-2.458-1.057.038-.329 1.799-.827 2.761-.341.665 1.095 1.018 1.095 1.018s.659-.01.694.79v.007c.008.204-.013.445-.108.769-.473 1.601 1.677 2.582 2.149.978.187-.635.114-1.193.02-1.708l-.009-.046c-.144-.766-.322-1.438.252-2.111z"/><path fill="#60352A" d="M16.518 1.64C15.457.398 13.998-.117 11.499.849c-2.183.844-1.366 2.72-.972 2.282.628-.696 1.477-.483 1.477-.483l.66 1.944s.314.189.445-.473 1.017-.729 1.308-.198c.452.826-.139.984-.193 1.478-.17 1.562 1.56 1.502 1.56 1.502s.337.132.912-1.001c.575-1.132.876-3.027-.178-4.26z"/><path fill="#AF7E57" d="M16.261 28.432c-.378-.1-.67-.432-.807-.785-.059-.152-.245-.89-.245-.89l-2.284.284c.043.214.114.512.185.94.054.324-.089.753.012.954.101.201.817.74 1.301.839 1.237.255 2.491-.342 2.644-.517.223-.254-.427-.725-.806-.825zm7.51-3.222c-.334-.065-.607-.336-.746-.634-.06-.129-.22-.651-.22-.651l-2.009.274c.05.183.129.438.216.804.066.278-.033.659.066.827.099.169.752.594 1.178.652 1.088.148 2.141-.443 2.264-.604.177-.233-.415-.603-.749-.668z"/><path fill="#292F33" d="M25.676 11.812c-.242-.036-2.877-.731-3.554-1.052-.903-.841-2.483-1.754-2.919-2.042s-.837-.637-1.828-.718h-1.639l-.751.766L13.56 8l-1.748.167c-2.198.338-4 3.024-4.794 4.151-.36.283-.685.614-.896.735-.389.223-2.813 1.505-3.334 2.005l.836 1.068c.312-.281 1.748-.596 2.748-1.046.396-.178 1.452-.296 1.982-.81l.017.017c1.396-.979 2.326-2.021 2.722-2.599L12.208 17s-.005 1.674.058 1.94c.088.372.353 1.449.353 1.884 0 0-.606 1.335-.302 2.484.403 1.529.611 3.468.653 4.008 1.412 0 2.24-.56 2.24-.56s-.278-.638-.165-1.577c.069-.572.58-1.601.58-2.45 0-.849-.095-1.367.031-1.719s.601-1.452.677-2.052c.02-.162.008-.374-.022-.6.534.292 1.493.792 2.084.954.849.232 1.494.595 1.718.79s.376.335.376.335-.201.557-.141 1.516c.055.877.433 1.658.54 2.703.893-.133 1.966-.567 1.966-.567s-.096-1.268-.078-1.848c.023-.706.412-2.193.265-2.824-.229-.981-1.5-2.047-2.677-2.948-1.177-.901-2.375-1.438-2.375-1.438.365-2.469-.005-3.781-.005-3.781s1.81.804 3.578 1.344c.577.285 2.27.562 3.989.5.432-.016.452-1.233.125-1.282z"/><path fill="#67757F" d="M7.265 13.194c.795-1.126 2.994-4.365 5.435-4.576 0 0 1.118 1.459 2.565 1.235 1.447-.224 1.482-1.318 1.482-1.318l1.727.149c.494.04.841.148 1.12.281-.163-.101-.304-.189-.391-.246-.435-.287-.837-.638-1.828-.719h-1.639l-.751.766L13.56 8l-1.748.167c-2.198.338-4 3.024-4.794 4.151-.36.283-.685.614-.896.735-.389.223-2.813 1.505-3.334 2.005l.288.368c1.224-.797 3.829-1.949 4.189-2.232zm15.956-1.75c.453.215 1.771.594 2.674.834-.016-.24-.089-.446-.219-.465-.2-.03-2.502-.686-3.513-1.033.212.162.682.465 1.058.664zm-2.139 11.291c-.06-.958.024-1.639-.072-1.843-.096-.204-.52-.455-.52-.455s-.201.557-.141 1.516c.055.877.433 1.658.54 2.703.309-.046.638-.128.938-.216-.613-.262-.707-1.099-.745-1.705z"/><path fill="#67757F" d="M13.135 24.147c-.303-1.149.176-2.906.176-2.906 0-.435-.23-1.357-.318-1.729-.063-.266-.103-2.438-.072-2.717 3.859-.123 5.068-1.763 5.068-1.763s-2.21 1.309-5.224.906c-.347-.718-1.03-4.737-1.03-4.737-.213-.025-.499.231-.642.487L12.208 17s-.005 1.674.058 1.94c.088.372.353 1.449.353 1.884 0 0-.606 1.335-.302 2.484.403 1.529.611 3.468.653 4.008.386 0 .724-.044 1.018-.104-.688-.618-.566-1.979-.853-3.065z"/></svg>
\ No newline at end of file