Merge branch 'master' into stable-spb-1.4

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