Merge branch 'master' into minor_fix

2021-01-04 01:30:28 -06:00
parent 7464446f64 d24275c51c
commit 50e799e959
243 changed files with 4897 additions and 2446 deletions
--- a/app/logical/upload_service/replacer.rb
+++ b/app/logical/upload_service/replacer.rb
@@ -11,7 +11,7 @@ class UploadService
    end

    def comment_replacement_message(post, replacement)
-      %("#{replacement.creator.name}":[/users/#{replacement.creator.id}] replaced this post with a new file:\n\n#{replacement_message(post, replacement)})
+      %("#{replacement.creator.name}":[#{Routes.user_path(replacement.creator)}] replaced this post with a new file:\n\n#{replacement_message(post, replacement)})
    end

    def replacement_message(post, replacement)