Download as
Browse Code »

Commit 03c4d8cf5b802593f618b413eece8b20e0e0a865

Authored by Braulio Bhavamitra
1 parent 8925ef9a
Exists in master and in 20 other branches add_member_task_reject_details, admin_visible_profile, community_notifications, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, organization_ratings_improvements, profile_api_improvements, ratings_minor_fixes, send_email_to_admins, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

rails4: fix array sum for paths

Showing 1 changed file with 2 additions and 2 deletions   Show diff stats
config/application.rb
  Diff comments   View file @03c4d8c
@@ -108,8 +108,8 @@ module Noosfero @@ -108,8 +108,8 @@ module Noosfero
108 :key => '_noosfero_session', 108 :key => '_noosfero_session',
109 } 109 }
110 110
111 - config.paths['db/migrate'] += Dir.glob "#{Rails.root}/{baseplugins,config/plugins}/*/db/migrate"  
112 - config.i18n.load_path += Dir.glob "#{Rails.root}/{baseplugins,config/plugins}/*/locales/*.{rb,yml}" 111 + config.paths['db/migrate'].concat Dir.glob("#{Rails.root}/{baseplugins,config/plugins}/*/db/migrate")
  112 + config.i18n.load_path.concat Dir.glob("#{Rails.root}/{baseplugins,config/plugins}/*/locales/*.{rb,yml}")
113 113
114 Noosfero::Plugin.setup(config) 114 Noosfero::Plugin.setup(config)
115 115