Download as
Browse Code »

Commit 5fd99be5c01f38a7e0d1239e211a800e6625a210

Authored by Antonio Terceiro
2 parents 3e384886 56b1ab7e
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 'ai3300' into 'master' 

Ai3300: In rails3, plugins' paths are being appended

See merge request !317
Showing 2 changed files with 2 additions and 2 deletions   Show diff stats
config/application.rb
  Diff comments   View file @5fd99be
... ... @@ -108,7 +108,7 @@ module Noosfero
108 108  
109 109 # Your secret key for verifying cookie session data integrity.
110 110 # If you change this key, all old sessions will become invalid!
111   - # Make sure the secret is at least 30 characters and all random,
  111 + # Make sure the secret is at least 30 characters and all random,
112 112 # no regular words or you'll be exposed to dictionary attacks.
113 113 config.secret_token = noosfero_session_secret
114 114 config.action_dispatch.session = {
... ...
lib/noosfero/plugin.rb
  Diff comments   View file @5fd99be
... ... @@ -71,7 +71,7 @@ class Noosfero::Plugin
71 71 end
72 72  
73 73 # add view path
74   - ActionController::Base.view_paths.unshift(File.join(dir, 'views'))
  74 + config.paths['app/views'].unshift File.join(dir, 'views')
75 75 end
76 76 end
77 77  
... ...