Merge remote-tracking branch 'upstream/pull/3886'

[rails.git] / app / abilities / ability.rb

diff --git a/app/abilities/ability.rb b/app/abilities/ability.rb
index e022f7993e79adcfd8d7047fd4cabc94269077d9..fd548c5f38a38a18a1d03f9f91972732b2d7816c 100644 (file)
--- a/app/abilities/ability.rb
+++ b/app/abilities/ability.rb
@@ -9,8 +9,7 @@ class Ability
     can :search, :direction
     can [:index, :permalink, :edit, :help, :fixthemap, :offline, :export, :about, :communities, :preview, :copyright, :key, :id], :site
     can [:finish, :embed], :export
-    can [:search, :search_latlon, :search_ca_postcode, :search_osm_nominatim,
-         :search_geonames, :search_osm_nominatim_reverse, :search_geonames_reverse], :geocoder
+    can [:search, :search_latlon, :search_osm_nominatim, :search_osm_nominatim_reverse], :geocoder
     can [:token, :request_token, :access_token, :test_request], :oauth
 
     if Settings.status != "database_offline"
@@ -33,7 +32,7 @@ class Ability
       can [:history, :version], OldRelation
     end
 
-    if user
+    if user&.active?
       can :welcome, :site
       can [:revoke, :authorize], :oauth
       can [:show], :deletion