Download as
Browse Code »

Commit 72cfd5811d1beaa9fb874fd339d71e4bd3bf87cc

Authored by Leandro Santos
2 parents b2083dec 56f0dd6e
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 branches 'rails3' and 'ActionItem3268_template_management' into ActionItem… 

…3268_template_management
Showing 1 changed file with 1 additions and 1 deletions   Show diff stats
lib/noosfero/plugin/routes.rb
  Diff comments   View file @72cfd58
1 -plugins_root = Rails.env.test? ? 'plugins' : File.join('config', 'plugins') 1 +plugins_root = Rails.env.test? ? 'plugins' : '{baseplugins,config/plugins}'
2 2
3 Dir.glob(Rails.root.join(plugins_root, '*', 'controllers')) do |controllers_dir| 3 Dir.glob(Rails.root.join(plugins_root, '*', 'controllers')) do |controllers_dir|
4 prefixes_by_folder = {'public' => 'plugin', 4 prefixes_by_folder = {'public' => 'plugin',