Download as
Browse Code »

Commit 8abe1cc553ac50a9683e2f48e63fbf1ba4f6da90

Authored by Antonio Terceiro
1 parent 949339eb
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

Removing redundancy in config loading

Showing 1 changed file with 1 additions and 2 deletions   Show diff stats
app/models/google_maps.rb
  Diff comments   View file @8abe1cc
@@ -11,8 +11,7 @@ class GoogleMaps @@ -11,8 +11,7 @@ class GoogleMaps
11 end 11 end
12 12
13 def config 13 def config
14 - @config = web2_conf['googlemaps'] if @config.nil?  
15 - @config ||= {} 14 + @config ||= (web2_conf['googlemaps'] || {})
16 end 15 end
17 16
18 def enabled? 17 def enabled?