mirror of https://github.com/tootsuite/mastodon
Remove duplicate method def `ApplicationHelper#instance_presenter` (#30331)
parent
fc166d07f0
commit
a6d12299f2
|
@ -240,6 +240,10 @@ module ApplicationHelper
|
|||
EmojiFormatter.new(html, custom_emojis, other_options.merge(animate: prefers_autoplay?)).to_s
|
||||
end
|
||||
|
||||
def mascot_url
|
||||
full_asset_url(instance_presenter.mascot&.file&.url || frontend_asset_path('images/elephant_ui_plane.svg'))
|
||||
end
|
||||
|
||||
def instance_presenter
|
||||
@instance_presenter ||= InstancePresenter.new
|
||||
end
|
||||
|
|
|
@ -1,11 +0,0 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
module MascotHelper
|
||||
def mascot_url
|
||||
full_asset_url(instance_presenter.mascot&.file&.url || frontend_asset_path('images/elephant_ui_plane.svg'))
|
||||
end
|
||||
|
||||
def instance_presenter
|
||||
@instance_presenter ||= InstancePresenter.new
|
||||
end
|
||||
end
|
|
@ -5,7 +5,6 @@ class UserMailer < Devise::Mailer
|
|||
|
||||
helper :accounts
|
||||
helper :application
|
||||
helper :mascot
|
||||
helper :formatting
|
||||
helper :instance
|
||||
helper :routing
|
||||
|
|
Loading…
Reference in New Issue