Download as
Browse Code »

Commit 3b5ba37521f74262ffe661e9f6933017f3d57ee0

Authored by Antonio Terceiro
2 parents 2926131c afa406c6
Exists in master and in 22 other branches angular_poc, api-article-archived, article-readonly, backup-7-jan-2016, captcha_serpro_plugin, content-manager-hostspot, export-comment-paragraph, fix_event_date_issue, login-captcha, master_rails3, new_video_plugin, pg_search_rank, production, refactor_with_role, refactor_with_role_scope, remove_profile_cat_icons, resend_confirmation_email, staging, staging_rails3, tasks_keep_filter_params, theme-brasil-digital-from-staging, travis

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,8 +118,8 @@ module Noosfero
118 config.time_zone = File.read('/etc/timezone').split("\n").first 118 config.time_zone = File.read('/etc/timezone').split("\n").first
119 config.active_record.default_timezone = :local 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 Noosfero::Plugin.setup(config) 124 Noosfero::Plugin.setup(config)
125 125