Download as
Browse Code »

Commit 85ae40bca7d821d9edb9304e6855a6dcb8dbdb4b

Authored by Joenio Costa
Committed by Daniela Feitosa
1 parent 1217170d
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

Removing noosfero.yml from repository 

(ActionItem1820)
Showing 4 changed files with 16 additions and 20 deletions   Show diff stats
config/initializers/load_config.rb
  Diff comments   View file @85ae40b
1   -NOOSFERO_CONF = YAML.load_file("#{RAILS_ROOT}/config/noosfero.yml")[RAILS_ENV]
  1 +file = "#{RAILS_ROOT}/config/noosfero.yml"
  2 +NOOSFERO_CONF = File.exists?(file) ? YAML.load_file(file)[RAILS_ENV] || {} : {}
... ...
config/noosfero.yml
View file @1217170
... ... @@ -1,14 +0,0 @@
1   -development: &DEVELOPMENT
2   - mail_enabled: true
3   - webmail_url: "http://localhost.localdomain/"
4   - addthis_enabled: true
5   - addthis_pub: your-user-name
6   - addthis_logo: http://localhost:3000/images/logo-200x50.png
7   - addthis_options: favorites, email, digg, delicious, technorati, slashdot, twitter, more
8   - gravatar: wavatar
9   - googlemaps_initial_zoom: 4
10   -
11   -test: &TEST
12   - <<: *DEVELOPMENT
13   -
14   -production:
config/noosfero.yml.dist 0 → 100644
  Diff comments   View file @85ae40b
... ... @@ -0,0 +1,13 @@
  1 +development:
  2 + mail_enabled: true
  3 + webmail_url: "http://localhost.localdomain/"
  4 + addthis_enabled: true
  5 + addthis_pub: your-user-name
  6 + addthis_logo: http://localhost:3000/images/logo-200x50.png
  7 + addthis_options: favorites, email, digg, delicious, technorati, slashdot, twitter, more
  8 + gravatar: wavatar
  9 + googlemaps_initial_zoom: 4
  10 +
  11 +test:
  12 +
  13 +production:
... ...
test/unit/load_config_test.rb
  Diff comments   View file @85ae40b
... ... @@ -2,11 +2,7 @@ require File.dirname(__FILE__) + &#39;/../test_helper&#39;
2 2  
3 3 class LoadConfigTest < Test::Unit::TestCase
4 4  
5   - should 'ensure YAML file exists' do
6   - assert File.exists?("#{RAILS_ROOT}/config/noosfero.yml")
7   - end
8   -
9   - should 'ensure YAML file was loaded' do
  5 + should 'ensure NOOSFERO_CONF was defined' do
10 6 assert NOOSFERO_CONF
11 7 assert_kind_of Hash, NOOSFERO_CONF
12 8 end
... ...