Download as
Browse Code »

Commit 2ee3ddc7fda5090aada2bd7038ec8935108081e2

Authored by Joenio Costa
2 parents 8b923e2a 55ac1172
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 branch 'stable'

Showing 2 changed files with 2 additions and 1 deletions   Show diff stats
lib/noosfero.rb
  Diff comments   View file @2ee3ddc
1 module Noosfero 1 module Noosfero
2 PROJECT = 'noosfero' 2 PROJECT = 'noosfero'
3 - VERSION = '0.25.1' 3 + VERSION = '0.25.2'
4 4
5 def self.pattern_for_controllers_in_directory(dir) 5 def self.pattern_for_controllers_in_directory(dir)
6 disjunction = controllers_in_directory(dir).join('|') 6 disjunction = controllers_in_directory(dir).join('|')
test/fixtures/environments.yml
  Diff comments   View file @2ee3ddc
@@ -4,6 +4,7 @@ colivre_net: @@ -4,6 +4,7 @@ colivre_net:
4 name: 'Colivre.net' 4 name: 'Colivre.net'
5 contact_email: 'colivre@localhost.localdomain' 5 contact_email: 'colivre@localhost.localdomain'
6 is_default: true 6 is_default: true
  7 + theme: 'default'
7 anhetegua_net: 8 anhetegua_net:
8 id: 2 9 id: 2
9 name: 'Anheteguá' 10 name: 'Anheteguá'