Download as
Browse Code »

Commit 866b98aa8495f2bad8600fa0d9abef048ce4991a

Authored by Thiago Ribeiro
2 parents 7a7be918 53a98d7c
Exists in stable-spb-1.4

Merge branch 'master' into stable-spb-1.4

Showing 9 changed files with 36 additions and 25 deletions   Show diff stats
@@ -3,37 +3,30 @@ Noosfero release tasks @@ -3,37 +3,30 @@ Noosfero release tasks
3 3
4 This file documents release-related activities. 4 This file documents release-related activities.
5 5
6 -Working with translations  
7 --------------------------  
8 -  
9 -* Update translation files: `rake updatepo`. Then `git commit` them.  
10 -* Send the PO files to the translators.  
11 -* Get the PO files back from translators, put in `po/` under the correct language name (e.,g. `po/pt_BR/`) and `git commit`.  
12 -* test translations: `rake makemo` and browse the application on the web.  
13 -  
14 Releasing noosfero 6 Releasing noosfero
15 ------------------ 7 ------------------
16 8
17 -Considering you are on a Debian GNU/Linux or Debian-based system 9 +Considering you are on a Debian GNU/Linux or Debian-based system, the following
  10 +packages are required during the release process:
18 11
19 - # apt-get install devscripts debhelper 12 +```
  13 +# apt install git devscripts debhelper
  14 +```
20 15
21 To prepare a release of noosfero, you must follow the steps below: 16 To prepare a release of noosfero, you must follow the steps below:
22 17
23 -* Finish all requirements and bugs assigned to the to-be-released version 18 +* Disable the automatic pushing of translation updates in weblate.
24 * Make sure all tests pass 19 * Make sure all tests pass
25 -* Write release notes at the version's wiki topic  
26 * Generate packages with `rake noosfero:release[(stable|test)]`. This task will: 20 * Generate packages with `rake noosfero:release[(stable|test)]`. This task will:
27 * Update the version in lib/noosfero.rb and debian/changelog. 21 * Update the version in lib/noosfero.rb and debian/changelog.
28 * Create the tarbal and the deb pkg under pkg/ directory. 22 * Create the tarbal and the deb pkg under pkg/ directory.
29 * Create a git tag and push it. 23 * Create a git tag and push it.
30 - * Upload the pkg to the configured repository (if configured) on ~/.dput.cf. 24 + * Upload the packages to the configured repository (if configured) on ~/.dput.cf.
31 * Test that the tarball and deb package are ok 25 * Test that the tarball and deb package are ok
32 -* Go to the version's wiki topic and edit it to reflect the new reality  
33 -* Edit the topic WebPreferences and update DEBIAN_REPOSITORY_TOPICS setting  
34 -* Attach the generated packages to that topic. Before attaching calculate the sha1 of the package (with sha1sum and paste the SHA1 hash as comment in the attachment form)  
35 -* Download the attached and verify the MD5 hash  
36 * Update an eventual demonstration version that you run. 26 * Update an eventual demonstration version that you run.
37 -* Write an announcement e-mail to the relevant mailing lists pointing to the release notes, and maybe to the demonstration version. 27 +* Write an announcement e-mail to the relevant mailing lists pointing to the
  28 + release notes, and maybe to the demonstration version.
  29 +* Re-enable the automatic pushing of trasnlatio updates in weblate.
38 30
39 -If you had any problem during these steps, you can do `rake clobber_package` to completely delete the generated packages and start the process again. 31 +If you had any problem during these steps, you can do `rake clobber_package` to
  32 +completely delete the generated packages and start the process again.
app/helpers/application_helper.rb
  Diff comments   View file @866b98a
@@ -1241,7 +1241,7 @@ module ApplicationHelper @@ -1241,7 +1241,7 @@ module ApplicationHelper
1241 end 1241 end
1242 1242
1243 def cache_timeout(key, timeout, &block) 1243 def cache_timeout(key, timeout, &block)
1244 - cache(key, { :expires_in => timeout }, &block) 1244 + cache(key, { :expires_in => timeout, :skip_digest => true }, &block)
1245 end 1245 end
1246 1246
1247 def is_cache_expired?(key) 1247 def is_cache_expired?(key)
app/models/block.rb
  Diff comments   View file @866b98a
@@ -235,7 +235,7 @@ class Block < ActiveRecord::Base @@ -235,7 +235,7 @@ class Block < ActiveRecord::Base
235 235
236 alias :active_record_cache_key :cache_key 236 alias :active_record_cache_key :cache_key
237 def cache_key(language='en', user=nil) 237 def cache_key(language='en', user=nil)
238 - active_record_cache_key+'-'+language 238 + active_record_cache_key + '-' + language
239 end 239 end
240 240
241 def timeout 241 def timeout
app/views/user_mailer/activation_code.text.erb
  Diff comments   View file @866b98a
1 <%= _('Hi, %{recipient}!') % { :recipient => @recipient } %> 1 <%= _('Hi, %{recipient}!') % { :recipient => @recipient } %>
2 2
3 -<%= word_wrap(_('Welcome to %{environment}! To activate your account, follow the link: %{activation_url}') % { :environment => @environment.name, :activation_url => @url + url_for(:controller => :account, :action => :activate, :activation_code => @activation_code, :redirection => @redirection, :join => @join) }) %> 3 +<%= word_wrap(_('Welcome to %{environment}! To activate your account, follow the link: %{activation_url}') % { :environment => @environment.name, :activation_url => url_for(:controller => :account, :action => :activate, :activation_code => @activation_code, :redirection => @redirection, :join => @join) }) %>
4 4
5 <%= _("Greetings,") %> 5 <%= _("Greetings,") %>
6 6
7 -- 7 --
8 <%= _('%s team.') % @environment.name %> 8 <%= _('%s team.') % @environment.name %>
9 -<%= url_for @url %> 9 +<%= @url %>
debian/changelog
  Diff comments   View file @866b98a
  1 +noosfero (1.4) jessie-test; urgency=medium
  2 +
  3 + * Noosfero 1.4
  4 +
  5 + -- Antonio Terceiro <terceiro@colivre.coop.br> Thu, 18 Feb 2016 16:20:23 -0200
  6 +
1 noosfero (1.4~rc3) jessie-test; urgency=medium 7 noosfero (1.4~rc3) jessie-test; urgency=medium
2 8
3 * Noosfero 1.4 RC3 9 * Noosfero 1.4 RC3
lib/noosfero/version.rb
  Diff comments   View file @866b98a
1 module Noosfero 1 module Noosfero
2 PROJECT = 'noosfero' 2 PROJECT = 'noosfero'
3 - VERSION = '1.4~rc3' 3 + VERSION = '1.4'
4 end 4 end
5 5
6 root = File.expand_path(File.dirname(__FILE__) + '/../..') 6 root = File.expand_path(File.dirname(__FILE__) + '/../..')
plugins/event/lib/event_plugin/event_block.rb
  Diff comments   View file @866b98a
@@ -81,4 +81,8 @@ class EventPlugin::EventBlock &lt; Block @@ -81,4 +81,8 @@ class EventPlugin::EventBlock &lt; Block
81 content_tag(:span, date.year.to_s, :class => 'year') 81 content_tag(:span, date.year.to_s, :class => 'year')
82 end 82 end
83 83
  84 + def self.expire_on
  85 + { :profile => [:article], :environment => [:article] }
  86 + end
  87 +
84 end 88 end
plugins/people_block/lib/ext/person.rb
  Diff comments   View file @866b98a
@@ -3,7 +3,7 @@ require_dependency &#39;person&#39; @@ -3,7 +3,7 @@ require_dependency &#39;person&#39;
3 class Person 3 class Person
4 4
5 scope :with_role, -> role_id { 5 scope :with_role, -> role_id {
6 - select('DISTINCT profiles.*').joins(:role_assignments). 6 + joins(:role_assignments).
7 where("role_assignments.role_id = #{role_id}") 7 where("role_assignments.role_id = #{role_id}")
8 } 8 }
9 9
plugins/people_block/test/unit/members_block_test.rb
  Diff comments   View file @866b98a
@@ -240,6 +240,10 @@ class MembersBlockTest &lt; ActionView::TestCase @@ -240,6 +240,10 @@ class MembersBlockTest &lt; ActionView::TestCase
240 240
241 assert_includes profiles, profile1 241 assert_includes profiles, profile1
242 assert_not_includes profiles, profile2 242 assert_not_includes profiles, profile2
  243 +
  244 + profile_list = block.profile_list
  245 + assert_includes profile_list, profile1
  246 + assert_not_includes profile_list, profile2
243 end 247 end
244 248
245 should 'list only profiles with member role' do 249 should 'list only profiles with member role' do
@@ -261,6 +265,10 @@ class MembersBlockTest &lt; ActionView::TestCase @@ -261,6 +265,10 @@ class MembersBlockTest &lt; ActionView::TestCase
261 265
262 assert_not_includes profiles, profile1 266 assert_not_includes profiles, profile1
263 assert_includes profiles, profile2 267 assert_includes profiles, profile2
  268 +
  269 + profile_list = block.profile_list
  270 + assert_not_includes profile_list, profile1
  271 + assert_includes profile_list, profile2
264 end 272 end
265 273
266 should 'list available roles' do 274 should 'list available roles' do