Download as
Browse Code »

Commit 738a6df3b2fbbbc04b21ca9186d56f79871fc5f1

Authored by Antonio Terceiro
2 parents f37708d4 9c300442
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

Merge branch 'rel-0.16.0'

Showing 2 changed files with 6 additions and 2 deletions   Show diff stats
@@ -18,7 +18,7 @@ Rake::PackageTask.new(Noosfero::PROJECT, Noosfero::VERSION) do |p| @@ -18,7 +18,7 @@ Rake::PackageTask.new(Noosfero::PROJECT, Noosfero::VERSION) do |p|
18 # application files 18 # application files
19 p.package_files.include('app/**/*.{rb,rhtml,rjs,rxml}') 19 p.package_files.include('app/**/*.{rb,rhtml,rjs,rxml}')
20 p.package_files.include('config/**/*.{rb,sqlite3}') 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 p.package_files.include('db/migrate/*.rb') 22 p.package_files.include('db/migrate/*.rb')
23 p.package_files.include('db/schema.rb') 23 p.package_files.include('db/schema.rb')
24 p.package_files.include('doc/README_FOR_APP') 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,7 +64,11 @@ Rails::Initializer.run do |config|
64 64
65 # Activate observers that should always be running 65 # Activate observers that should always be running
66 # config.active_record.observers = :cacher, :garbage_collector 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 # Make Active Record use UTC-base instead of local time 72 # Make Active Record use UTC-base instead of local time
69 # config.active_record.default_timezone = :utc 73 # config.active_record.default_timezone = :utc
70 74