Refactor site#welcome to use abilities instead of require_user

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index 2fa91256e68d723cde675e16c4e49d80c225870b..4b960e4e2b9682fd6e49036a25fff89093988bf0 100644 (file)
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -103,9 +103,7 @@ class SiteController < ApplicationController
     @locale = params[:copyright_locale] || I18n.locale
   end
 
-  def welcome
-    require_user
-  end
+  def welcome; end
 
   def help; end
 

diff --git a/app/models/ability.rb b/app/models/ability.rb
index 3919bde921f728a4d66b229978b3dc85724796c1..3ff46656899c0d45214ef1eb7e72f24e86705ec8 100644 (file)
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -5,7 +5,7 @@ class Ability
 
   def initialize(user)
     can :index, :site
-    can [:permalink, :edit, :help, :fixthemap, :offline, :export, :about, :preview, :copyright, :key, :id, :welcome], :site
+    can [:permalink, :edit, :help, :fixthemap, :offline, :export, :about, :preview, :copyright, :key, :id], :site
 
     can [:index, :rss, :show, :comments], DiaryEntry
 
@@ -13,7 +13,7 @@ class Ability
          :search_geonames, :search_osm_nominatim_reverse, :search_geonames_reverse], :geocoder
 
     if user
-      can :weclome, :site
+      can :welcome, :site
 
       can [:create, :edit, :comment, :subscribe, :unsubscribe], DiaryEntry