Download as
Browse Code »

Commit 3dd7c8f05c5244ed8bf303bed6ce255999f77cfc

Authored by Rodrigo Souto
2 parents f8bd7f1b d60d3deb
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 commit 'refs/merge-requests/252' of git://gitorious.org/noosfero/noosfero … 

…into merge-requests/252
Showing 1 changed file with 2 additions and 1 deletions   Show diff stats
app/models/environment.rb
  Diff comments   View file @3dd7c8f
@@ -234,7 +234,8 @@ class Environment < ActiveRecord::Base @@ -234,7 +234,8 @@ class Environment < ActiveRecord::Base
234 end 234 end
235 235
236 settings_items :activation_blocked_text, :type => String 236 settings_items :activation_blocked_text, :type => String
237 - settings_items :message_for_disabled_enterprise, :type => String 237 + settings_items :message_for_disabled_enterprise, :type => String,
  238 + :default => _('This enterprise needs to be enabled.')
238 settings_items :location, :type => String 239 settings_items :location, :type => String
239 settings_items :layout_template, :type => String, :default => 'default' 240 settings_items :layout_template, :type => String, :default => 'default'
240 settings_items :homepage, :type => String 241 settings_items :homepage, :type => String