[Git][noosfero/noosfero][stable-1.7] 4 commits: Merge fixes

[Rodrigo Souto]

Rodrigo Souto pushed to branch stable-1.7 at Noosfero / noosfero


Commits:
43076049 by Rodrigo Souto at 2017-01-23T16:48:39-03:00
Merge fixes

- - - - -
0e6d5208 by Rodrigo Souto at 2017-01-23T16:52:01-03:00
Normalize authors

- - - - -
0bd010c3 by Rodrigo Souto at 2017-01-23T19:52:11+00:00
Updating authors file

- - - - -
5e1bb366 by Rodrigo Souto at 2017-01-23T19:54:02+00:00
Bumping version 1.7.1

- - - - -


5 changed files:

- AUTHORS.md
- db/migrate/20170120221747_update_access_level_settings.rb
- debian/changelog
- lib/noosfero/version.rb
- script/authors.sed


Changes:

=====================================
AUTHORS.md
=====================================
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -75,7 +75,7 @@ Iago Rodrigues <iago006 at hotmailcom>
 Iolane Andrade <andrade.icaa at gmail.com>
 Iryna Pruitt <jdpruitt2807 at prodigy.net>
 Isaac Canan <isaac at intelletto.com.br>
-Italo Valcy <italo at dcc.ufba.br>
+Italo Valcy <italovalcy at ufba.br>
 Izharul Haq <atoz.chevara.2013 at gmail.com>
 Jefferson Fernandes <jeffs.fernandes at gmail.com>
 Joenio Costa <joenio at colivre.coop.br>


=====================================
db/migrate/20170120221747_update_access_level_settings.rb
=====================================
--- a/db/migrate/20170120221747_update_access_level_settings.rb
+++ b/db/migrate/20170120221747_update_access_level_settings.rb
@@ -7,13 +7,13 @@ class UpdateAccessLevelSettings < ActiveRecord::Migration
       'self' => 3,
     }
 
-    select_all("SELECT id, data FROM profiles WHERE type='Person' AND data LIKE '%:wall_access:%'").find_each do |person|
+    select_all("SELECT id, data FROM profiles WHERE type='Person' AND data LIKE '%:wall_access:%'").each do |person|
       data = YAML.load(person['data'] || {}.to_yaml)
       data[:wall_access] = valid_levels[data[:wall_access]] || valid_levels['self']
       update("UPDATE profiles SET data=#{connection.quote(data.to_yaml)} WHERE id=#{person['id']}")
     end
 
-    select_all("SELECT id, setting FROM articles WHERE type='Forum' AND setting LIKE '%:topic_creation:%'").find_each do |forum|
+    select_all("SELECT id, setting FROM articles WHERE type='Forum' AND setting LIKE '%:topic_creation:%'").each do |forum|
       data = YAML.load(forum['setting'] || {}.to_yaml)
       data[:topic_creation] = valid_levels[data[:topic_creation]] || valid_levels['self']
       update("UPDATE articles SET setting=#{connection.quote(data.to_yaml)} WHERE id=#{forum['id']}")


=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+noosfero (1.7.1) jessie-test; urgency=medium
+
+  * Noosfero 1.7.1
+
+ -- Rodrigo Souto <rodrigo at colivre.coop.br>  Mon, 23 Jan 2017 19:53:58 +0000
+
 noosfero (1.7.0) jessie-test; urgency=medium
 
   * Noosfero 1.7.0


=====================================
lib/noosfero/version.rb
=====================================
--- a/lib/noosfero/version.rb
+++ b/lib/noosfero/version.rb
@@ -1,6 +1,6 @@
 module Noosfero
   PROJECT = 'noosfero'
-  VERSION = '1.7.0'
+  VERSION = '1.7.1'
 end
 
 root = File.expand_path(File.dirname(__FILE__) + '/../..')


=====================================
script/authors.sed
=====================================
--- a/script/authors.sed
+++ b/script/authors.sed
@@ -116,6 +116,8 @@ s/Guilherme Rojas <diegoamc90 at gmail.com>/Guilherme Rojas <guilhermehrojas at gmail.
 
 s/Hebert Douglas <hebertdougl at gmail>/Hebert Douglas <hebertdougl at gmail.com>/
 
+s/Italo Valcy <italo at dcc.ufba.br>/Italo Valcy <italovalcy at ufba.br>/
+
 s/Jefferson <diegoamc90 at gmail.com>/Jefferson Fernandes <jeffs.fernandes at gmail.com>/
 s/Jefferson Fernandes$/Jefferson Fernandes <jeffs.fernandes at gmail.com>/
 s/Jefferson Fernandes <alessandro.palmeira at gmail.com>/Jefferson Fernandes <jeffs.fernandes at gmail.com>/



View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/b51edcf3339d71e84897b41faccbcd07c66c7d11...5e1bb366ef5b3e61b8eff943e0cb6db3dc7cd034
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20170124/bb65a02c/attachment-0001.html>