Download as
Browse Code »

Commit 654b6f74b606df8a39fb25c26771dc3b8ee69c16

Authored by Weblate
2 parents d9de89cc 4c229767
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 remote-tracking branch 'origin/master'

Showing 1 changed file with 0 additions and 3 deletions   Show diff stats
config/application.rb
  Diff comments   View file @654b6f7
@@ -113,9 +113,6 @@ module Noosfero @@ -113,9 +113,6 @@ module Noosfero
113 config.secret_token = noosfero_session_secret 113 config.secret_token = noosfero_session_secret
114 config.session_store :cookie_store, :key => '_noosfero_session' 114 config.session_store :cookie_store, :key => '_noosfero_session'
115 115
116 - config.time_zone = File.read('/etc/timezone').split("\n").first  
117 - config.active_record.default_timezone = :local  
118 -  
119 config.paths['db/migrate'] += Dir.glob "#{Rails.root}/{baseplugins,config/plugins}/*/db/migrate" 116 config.paths['db/migrate'] += Dir.glob "#{Rails.root}/{baseplugins,config/plugins}/*/db/migrate"
120 config.i18n.load_path += Dir.glob "#{Rails.root}/{baseplugins,config/plugins}/*/locales/*.{rb,yml}" 117 config.i18n.load_path += Dir.glob "#{Rails.root}/{baseplugins,config/plugins}/*/locales/*.{rb,yml}"
121 118