Merge remote-tracking branch 'upstream/master'

derpibooru · Jul 29, 2024 · 81a2bc9 · 81a2bc9
2 parents c3fe297 + 7d432c5
commit 81a2bc9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/lib/philomena/images.ex b/lib/philomena/images.ex
@@ -941,8 +941,8 @@ defmodule Philomena.Images do
 
     {merge_notification_count, nil} =
       ImageMergeNotification
-      |> where(image_id: ^source.id)
-      |> Repo.update_all(set: [image_id: target.id])
+      |> where(target_id: ^source.id)
+      |> Repo.update_all(set: [target_id: target.id])
 
     {:ok, {comment_notification_count, merge_notification_count}}
   end

diff --git a/lib/philomena_web/templates/tag/_tag_editor.html.slime b/lib/philomena_web/templates/tag/_tag_editor.html.slime
@@ -11,7 +11,6 @@ elixir:
   .js-taginput.input.input--wide.tagsinput.hidden class="js-taginput-fancy" data-click-focus=".js-taginput-input.js-taginput-#{@name}"
     input.input class="js-taginput-input js-taginput-#{@name}" id="taginput-fancy-#{@name}" type="text" placeholder="add a tag" autocomplete="off" autocapitalize="none" data-ac="true" data-ac-min-length="3" data-ac-source="/autocomplete/tags?term="
 button.button.button--state-primary.button--bold class="js-taginput-show" data-click-show=".js-taginput-fancy,.js-taginput-hide" data-click-hide=".js-taginput-plain,.js-taginput-show" data-click-focus=".js-taginput-input.js-taginput-#{@name}"
-  = hidden_input :fuck_ie, :fuck_ie, value: "fuck_ie"
   ' Fancy Editor
 button.hidden.button.button--state-primary.button--bold class="js-taginput-hide" data-click-show=".js-taginput-plain,.js-taginput-show" data-click-hide=".js-taginput-fancy,.js-taginput-hide" data-click-focus=".js-taginput-plain.js-taginput-#{@name}"
   ' Plain Editor