Download as
Browse Code »

Commit 3b5ba37521f74262ffe661e9f6933017f3d57ee0

Authored by Antonio Terceiro
2 parents 2926131c afa406c6
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, 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, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Merge branch 'plugins-paths' into 'master' 

Fix baseplugins addition

See merge request !356
Showing 1 changed file with 2 additions and 2 deletions   Show diff stats
config/application.rb
  Diff comments   View file @3b5ba37
... ... @@ -118,8 +118,8 @@ module Noosfero
118 118 config.time_zone = File.read('/etc/timezone').split("\n").first
119 119 config.active_record.default_timezone = :local
120 120  
121   - config.paths['db/migrate'] += Dir.glob "#{Rails.root}/{baseplugins,config/plugins/*}/db/migrate"
122   - config.i18n.load_path += Dir.glob "#{Rails.root}/{baseplugins,config/plugins/*}/locales/*.{rb,yml}"
  121 + config.paths['db/migrate'] += Dir.glob "#{Rails.root}/{baseplugins,config/plugins}/*/db/migrate"
  122 + config.i18n.load_path += Dir.glob "#{Rails.root}/{baseplugins,config/plugins}/*/locales/*.{rb,yml}"
123 123  
124 124 Noosfero::Plugin.setup(config)
125 125  
... ...