Download as
Browse Code »

Commit 28849fac6109b334216fbdce170dde6162f2c611

Authored by Evandro Junior
2 parents e04a0099 bc86e695
Exists in staging and in 4 other branches captcha_serpro_plugin, login-captcha, production, production-vendorized

Merge branch 'production' of gitlab.com:participa/noosfero into production 

* 'production' of gitlab.com:participa/noosfero:
  Fix timezone
  Fix event test when a time zone is set
  Update proposal discussion plugin
  Update proposal app
Showing 4 changed files with 5 additions and 4 deletions   Show diff stats
config/application.rb
  Diff comments   View file @28849fa
... ... @@ -62,7 +62,7 @@ module Noosfero
62 62 # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
63 63 # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
64 64 # config.time_zone = 'Central Time (US & Canada)'
65   - #config.time_zone = 'Brasilia'
  65 + config.time_zone = 'Brasilia'
66 66  
67 67  
68 68 # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
... ...
plugins/proposals_discussion
  Diff comments   View file @28849fa
1   -Subproject commit 2c35c315ade86c3335fd93944631cd37d944d249
  1 +Subproject commit ccc7f89eff12d956ed67ad131e22eca614c7e0d9
... ...
public/proposal-app
  Diff comments   View file @28849fa
1   -Subproject commit e9bfbb5d86e6ebbf7be35d81d924096d51f098a1
  1 +Subproject commit 0fcc9553452fbea7e146076491bea144c7b4ccff
... ...
test/unit/event_test.rb
  Diff comments   View file @28849fa
... ... @@ -97,7 +97,8 @@ class EventTest < ActiveSupport::TestCase
97 97 end
98 98  
99 99 should 'provide nice display format' do
100   - event = build(Event, :start_date => DateTime.new(2008,1,1), :end_date => DateTime.new(2008,1,1), :link => 'http://www.myevent.org', :body => '<p>my somewhat short description</p>')
  100 + date = Time.zone.local(2008, 1, 1, 0, 0, 0)
  101 + event = build(Event, :start_date => date, :end_date => date, :link => 'http://www.myevent.org', :body => '<p>my somewhat short description</p>')
101 102 display = instance_eval(&event.to_html)
102 103  
103 104 assert_tag_in_string display, :content => Regexp.new("January 1, 2008")
... ...