about summary refs log tree commit diff
path: root/app/lib
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2021-09-30 00:01:20 +0200
committerClaire <claire.github-309c@sitedethib.com>2021-09-30 00:01:20 +0200
commit29b5c5f4830f9bda0af352b1d6ac73830a6cfd4e (patch)
tree899cb5f54098d08f28dad2c8ee555b3557dead16 /app/lib
parent00889b313176308018d66e54b5cb7dcc92da1587 (diff)
parentfc3ae1343df5adb83a3733958a4436981feb380f (diff)
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/models/custom_emoji.rb`:
  Slight refactor upstream, next to a line that was different in glitch-soc
  because of our local configurable limits on custom emoji size.
  Ported upstream changes.
- `yarn.lock`:
  Not really a conflict, upstream dependency textually too close to a
  glitch-soc-only dependency.
  Updated upstream dependency as upstream.
Diffstat (limited to 'app/lib')
-rw-r--r--app/lib/fast_geometry_parser.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/lib/fast_geometry_parser.rb b/app/lib/fast_geometry_parser.rb
index 5209c2bc5..f3395a833 100644
--- a/app/lib/fast_geometry_parser.rb
+++ b/app/lib/fast_geometry_parser.rb
@@ -2,7 +2,7 @@
 
 class FastGeometryParser
   def self.from_file(file)
-    width, height = FastImage.size(file.path)
+    width, height = FastImage.size(file)
 
     raise Paperclip::Errors::NotIdentifiedByImageMagickError if width.nil?