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

[rails.git] / config / settings.yml

diff --git a/config/settings.yml b/config/settings.yml
index c057be978a841485174d6714ea3499744011fd2e..ec868b651baa84d729f5305c3bcb859e4ac6899f 100644 (file)
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -97,9 +97,12 @@ attachments_dir: ":rails_root/public/attachments"
 #memcache_servers: []
 # Enable HTTP basic authentication support
 basic_auth_support: true
 #memcache_servers: []
 # Enable HTTP basic authentication support
 basic_auth_support: true

+# Enable OAuth 1.0/1.0a registration
+oauth_10_registration: true

 # Enable legacy OAuth 1.0 support
 oauth_10_support: true
 # Enable legacy OAuth 1.0 support
 oauth_10_support: true

-oauth_10_registration: true
+# Enable OAuth 1.0a support
+oauth_10a_support: true

 # URL of Nominatim instance to use for geocoding
 nominatim_url: "https://nominatim.openstreetmap.org/"
 # Default editor
 # URL of Nominatim instance to use for geocoding
 nominatim_url: "https://nominatim.openstreetmap.org/"
 # Default editor