Download as
Browse Code »

Commit 738a6df3b2fbbbc04b21ca9186d56f79871fc5f1

Authored by Antonio Terceiro
2 parents f37708d4 9c300442
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

Merge branch 'rel-0.16.0'

Showing 2 changed files with 6 additions and 2 deletions   Show diff stats
Rakefile.pkg
  Diff comments   View file @738a6df
... ... @@ -18,7 +18,7 @@ Rake::PackageTask.new(Noosfero::PROJECT, Noosfero::VERSION) do |p|
18 18 # application files
19 19 p.package_files.include('app/**/*.{rb,rhtml,rjs,rxml}')
20 20 p.package_files.include('config/**/*.{rb,sqlite3}')
21   - p.package_files.include('config/ferret_server.yml')
  21 + p.package_files.include('config/ferret_server.yml.dist')
22 22 p.package_files.include('db/migrate/*.rb')
23 23 p.package_files.include('db/schema.rb')
24 24 p.package_files.include('doc/README_FOR_APP')
... ...
config/environment.rb
  Diff comments   View file @738a6df
... ... @@ -64,7 +64,11 @@ Rails::Initializer.run do |config|
64 64  
65 65 # Activate observers that should always be running
66 66 # config.active_record.observers = :cacher, :garbage_collector
67   - config.active_record.observers = :article_sweeper
  67 +
  68 + # don't load the sweepers while loading the database
  69 + unless $PROGRAM_NAME =~ /rake$/ && ARGV.first == 'db:schema:load'
  70 + config.active_record.observers = :article_sweeper
  71 + end
68 72 # Make Active Record use UTC-base instead of local time
69 73 # config.active_record.default_timezone = :utc
70 74  
... ...