From a4c56505f41a191a21e595c26060510df3f2b909 Mon Sep 17 00:00:00 2001
From: Fire Demon <firedemon@creature.cafe>
Date: Wed, 26 Aug 2020 15:26:51 -0500
Subject: [UI] Merge landing and about page

---
 app/controllers/about_controller.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'app/controllers/about_controller.rb')

diff --git a/app/controllers/about_controller.rb b/app/controllers/about_controller.rb
index 1f8f9ff58..bf3d3ff42 100644
--- a/app/controllers/about_controller.rb
+++ b/app/controllers/about_controller.rb
@@ -11,9 +11,7 @@ class AboutController < ApplicationController
 
   skip_before_action :require_functional!, only: [:more, :terms]
 
-  def show; end
-
-  def more
+  def show
     flash.now[:notice] = I18n.t('about.instance_actor_flash') if params[:instance_actor]
 
     toc_generator = TOCGenerator.new(@instance_presenter.site_extended_description)
@@ -24,6 +22,8 @@ class AboutController < ApplicationController
     @allows            = DomainAllow.where(hidden: false) if display_allows?
   end
 
+  alias more show
+
   def terms; end
 
   helper_method :display_allows?
-- 
cgit