Merge branch 'master' into staging_rails4

Conflicts: app/models/environment.rb app/views/profile_editor/_person.html.erb db/schema.rb lib/noosfero/api/v1/comments.rb lib/noosfero/api/v1/people.rb test/unit/api/people_test.rb

Merge branch 'master' into staging_rails4
Conflicts: app/models/environment.rb app/views/profile_editor/_person.html.erb db/schema.rb lib/noosfero/api/v1/comments.rb lib/noosfero/api/v1/people.rb test/unit/api/people_test.rb
Victor Costa
2 parents d26eed6e e65387e7
Showing 13 changed files with 337 additions and 457 deletions Show diff stats
config/environments/production.rb
db/schema.rb
debian/noosfero.prerm
debian/rules
features/step_definitions/web_steps.rb
plugins/newsletter/public/style.css
plugins/newsletter/test/functional/newsletter_plugin_admin_controller_test.rb
plugins/newsletter/test/functional/newsletter_plugin_controller_test.rb
plugins/newsletter/views/tasks/newsletter_plugin/_moderate_newsletter_accept_details.html.erb
plugins/organization_ratings/controllers/organization_ratings_plugin_profile_controller.rb
plugins/organization_ratings/lib/organization_ratings_plugin.rb
plugins/sniffer/lib/sniffer_plugin/helper.rb
test/unit/api/search_test.rb
@@ -44,7 +44,7 @@ Noosfero::Application.configure do
   # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
   # Use a different cache store in production
-  config.cache_store = :dalli_store, "127.0.0.1:11211"
+  config.cache_store = :dalli_store, "127.0.0.1:11211", { :namespace => "noosfero/#{Noosfero::VERSION}" }
   # Enable serving of images, stylesheets, and javascripts from an asset server
   # config.action_controller.asset_host                  = "http://assets.example.com"
@@ -9,11 +9,14 @@
 # from scratch. The latter is a flawed and unsustainable approach (the more migrations
 # you'll amass, the slower it'll run and the greater likelihood for issues).
 #
-# It's strongly recommended to check this file into your version control system.
+# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20150918005035) do
+ActiveRecord::Schema.define(version: 20150921140802) do
-  create_table "abuse_reports", :force => true do |t|
+  # These are extensions that must be enabled in order to support this database
+  enable_extension "plpgsql"
+
+  create_table "abuse_reports", force: :cascade do |t|
     t.integer  "reporter_id"
     t.integer  "abuse_complaint_id"
     t.text     "content"
@@ -22,7 +25,7 @@ ActiveRecord::Schema.define(:version =&gt; 20150918005035) do
     t.datetime "updated_at"
   end
-  create_table "action_tracker", :force => true do |t|
+  create_table "action_tracker", force: :cascade do |t|
     t.integer  "user_id"
     t.string   "user_type"
     t.integer  "target_id"
@@ -31,46 +34,34 @@ ActiveRecord::Schema.define(:version =&gt; 20150918005035) do
     t.string   "verb"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.integer  "comments_count", :default => 0
-    t.boolean  "visible",        :default => true
+    t.integer  "comments_count", default: 0
+    t.boolean  "visible",        default: true
   end
-  add_index "action_tracker", ["target_id", "target_type"], :name => "index_action_tracker_on_dispatcher_id_and_dispatcher_type"
-  add_index "action_tracker", ["user_id", "user_type"], :name => "index_action_tracker_on_user_id_and_user_type"
-  add_index "action_tracker", ["verb"], :name => "index_action_tracker_on_verb"
+  add_index "action_tracker", ["target_id", "target_type"], name: "index_action_tracker_on_dispatcher_id_and_dispatcher_type", using: :btree
+  add_index "action_tracker", ["user_id", "user_type"], name: "index_action_tracker_on_user_id_and_user_type", using: :btree
+  add_index "action_tracker", ["verb"], name: "index_action_tracker_on_verb", using: :btree
-  create_table "action_tracker_notifications", :force => true do |t|
+  create_table "action_tracker_notifications", force: :cascade do |t|
     t.integer "action_tracker_id"
     t.integer "profile_id"
   end
-  add_index "action_tracker_notifications", ["action_tracker_id"], :name => "index_action_tracker_notifications_on_action_tracker_id"
-  add_index "action_tracker_notifications", ["profile_id", "action_tracker_id"], :name => "index_action_tracker_notif_on_prof_id_act_tracker_id", :unique => true
-  add_index "action_tracker_notifications", ["profile_id"], :name => "index_action_tracker_notifications_on_profile_id"
-
-  create_table "article_followers", :force => true do |t|
-    t.integer  "person_id",  :null => false
-    t.integer  "article_id", :null => false
-    t.datetime "since"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  add_index "article_followers", ["article_id"], :name => "index_article_followers_on_article_id"
-  add_index "article_followers", ["person_id", "article_id"], :name => "index_article_followers_on_person_id_and_article_id", :unique => true
-  add_index "article_followers", ["person_id"], :name => "index_article_followers_on_person_id"
+  add_index "action_tracker_notifications", ["action_tracker_id"], name: "index_action_tracker_notifications_on_action_tracker_id", using: :btree
+  add_index "action_tracker_notifications", ["profile_id", "action_tracker_id"], name: "index_action_tracker_notif_on_prof_id_act_tracker_id", unique: true, using: :btree
+  add_index "action_tracker_notifications", ["profile_id"], name: "index_action_tracker_notifications_on_profile_id", using: :btree
-  create_table "article_privacy_exceptions", :id => false, :force => true do |t|
+  create_table "article_privacy_exceptions", id: false, force: :cascade do |t|
     t.integer "article_id"
     t.integer "person_id"
   end
-  create_table "article_versions", :force => true do |t|
+  create_table "article_versions", force: :cascade do |t|
     t.integer  "article_id"
     t.integer  "version"
     t.string   "name"
     t.string   "slug"
-    t.text     "path",                 :default => ""
+    t.text     "path",                 default: ""
     t.integer  "parent_id"
     t.text     "body"
     t.text     "abstract"
@@ -85,44 +76,43 @@ ActiveRecord::Schema.define(:version =&gt; 20150918005035) do
     t.integer  "width"
     t.string   "versioned_type"
     t.integer  "comments_count"
-    t.boolean  "advertise",            :default => true
-    t.boolean  "published",            :default => true
+    t.boolean  "advertise",            default: true
+    t.boolean  "published",            default: true
     t.datetime "start_date"
     t.datetime "end_date"
-    t.integer  "children_count",       :default => 0
-    t.boolean  "accept_comments",      :default => true
+    t.integer  "children_count",       default: 0
+    t.boolean  "accept_comments",      default: true
     t.integer  "reference_article_id"
     t.text     "setting"
-    t.boolean  "notify_comments",      :default => false
-    t.integer  "hits",                 :default => 0
+    t.boolean  "notify_comments",      default: false
+    t.integer  "hits",                 default: 0
     t.datetime "published_at"
     t.string   "source"
-    t.boolean  "highlighted",          :default => false
+    t.boolean  "highlighted",          default: false
     t.string   "external_link"
-    t.boolean  "thumbnails_processed", :default => false
-    t.boolean  "is_image",             :default => false
+    t.boolean  "thumbnails_processed", default: false
+    t.boolean  "is_image",             default: false
     t.integer  "translation_of_id"
     t.string   "language"
     t.string   "source_name"
     t.integer  "license_id"
     t.integer  "image_id"
     t.integer  "position"
-    t.integer  "spam_comments_count",  :default => 0
+    t.integer  "spam_comments_count",  default: 0
     t.integer  "author_id"
     t.integer  "created_by_id"
-    t.integer  "followers_count"
   end
-  add_index "article_versions", ["article_id"], :name => "index_article_versions_on_article_id"
-  add_index "article_versions", ["parent_id"], :name => "index_article_versions_on_parent_id"
-  add_index "article_versions", ["path", "profile_id"], :name => "index_article_versions_on_path_and_profile_id"
-  add_index "article_versions", ["path"], :name => "index_article_versions_on_path"
-  add_index "article_versions", ["published_at", "id"], :name => "index_article_versions_on_published_at_and_id"
+  add_index "article_versions", ["article_id"], name: "index_article_versions_on_article_id", using: :btree
+  add_index "article_versions", ["parent_id"], name: "index_article_versions_on_parent_id", using: :btree
+  add_index "article_versions", ["path", "profile_id"], name: "index_article_versions_on_path_and_profile_id", using: :btree
+  add_index "article_versions", ["path"], name: "index_article_versions_on_path", using: :btree
+  add_index "article_versions", ["published_at", "id"], name: "index_article_versions_on_published_at_and_id", using: :btree
-  create_table "articles", :force => true do |t|
+  create_table "articles", force: :cascade do |t|
     t.string   "name"
     t.string   "slug"
-    t.text     "path",                 :default => ""
+    t.text     "path",                 default: ""
     t.integer  "parent_id"
     t.text     "body"
     t.text     "abstract"
@@ -137,133 +127,119 @@ ActiveRecord::Schema.define(:version =&gt; 20150918005035) do
     t.string   "filename"
     t.integer  "height"
     t.integer  "width"
-    t.integer  "comments_count",       :default => 0
-    t.boolean  "advertise",            :default => true
-    t.boolean  "published",            :default => true
+    t.integer  "comments_count",       default: 0
+    t.boolean  "advertise",            default: true
+    t.boolean  "published",            default: true
     t.datetime "start_date"
     t.datetime "end_date"
-    t.integer  "children_count",       :default => 0
-    t.boolean  "accept_comments",      :default => true
+    t.integer  "children_count",       default: 0
+    t.boolean  "accept_comments",      default: true
     t.integer  "reference_article_id"
     t.text     "setting"
-    t.boolean  "notify_comments",      :default => true
-    t.integer  "hits",                 :default => 0
+    t.boolean  "notify_comments",      default: true
+    t.integer  "hits",                 default: 0
     t.datetime "published_at"
     t.string   "source"
-    t.boolean  "highlighted",          :default => false
+    t.boolean  "highlighted",          default: false
     t.string   "external_link"
-    t.boolean  "thumbnails_processed", :default => false
-    t.boolean  "is_image",             :default => false
+    t.boolean  "thumbnails_processed", default: false
+    t.boolean  "is_image",             default: false
     t.integer  "translation_of_id"
     t.string   "language"
     t.string   "source_name"
     t.integer  "license_id"
     t.integer  "image_id"
     t.integer  "position"
-    t.integer  "spam_comments_count",  :default => 0
+    t.integer  "spam_comments_count",  default: 0
     t.integer  "author_id"
     t.integer  "created_by_id"
-    t.boolean  "show_to_followers",    :default => true
-    t.integer  "sash_id"
-    t.integer  "level",                :default => 0
-    t.integer  "followers_count",      :default => 0
-  end
-
-  add_index "articles", ["comments_count"], :name => "index_articles_on_comments_count"
-  add_index "articles", ["created_at"], :name => "index_articles_on_created_at"
-  add_index "articles", ["hits"], :name => "index_articles_on_hits"
-  add_index "articles", ["name"], :name => "index_articles_on_name"
-  add_index "articles", ["parent_id"], :name => "index_articles_on_parent_id"
-  add_index "articles", ["path", "profile_id"], :name => "index_articles_on_path_and_profile_id"
-  add_index "articles", ["path"], :name => "index_articles_on_path"
-  add_index "articles", ["profile_id"], :name => "index_articles_on_profile_id"
-  add_index "articles", ["published_at", "id"], :name => "index_articles_on_published_at_and_id"
-  add_index "articles", ["slug"], :name => "index_articles_on_slug"
-  add_index "articles", ["translation_of_id"], :name => "index_articles_on_translation_of_id"
-  add_index "articles", ["type", "parent_id"], :name => "index_articles_on_type_and_parent_id"
-  add_index "articles", ["type", "profile_id"], :name => "index_articles_on_type_and_profile_id"
-  add_index "articles", ["type"], :name => "index_articles_on_type"
-
-  create_table "articles_categories", :id => false, :force => true do |t|
+    t.boolean  "show_to_followers",    default: true
+  end
+
+  add_index "articles", ["comments_count"], name: "index_articles_on_comments_count", using: :btree
+  add_index "articles", ["created_at"], name: "index_articles_on_created_at", using: :btree
+  add_index "articles", ["hits"], name: "index_articles_on_hits", using: :btree
+  add_index "articles", ["name"], name: "index_articles_on_name", using: :btree
+  add_index "articles", ["parent_id"], name: "index_articles_on_parent_id", using: :btree
+  add_index "articles", ["path", "profile_id"], name: "index_articles_on_path_and_profile_id", using: :btree
+  add_index "articles", ["path"], name: "index_articles_on_path", using: :btree
+  add_index "articles", ["profile_id"], name: "index_articles_on_profile_id", using: :btree
+  add_index "articles", ["published_at", "id"], name: "index_articles_on_published_at_and_id", using: :btree
+  add_index "articles", ["slug"], name: "index_articles_on_slug", using: :btree
+  add_index "articles", ["translation_of_id"], name: "index_articles_on_translation_of_id", using: :btree
+  add_index "articles", ["type", "parent_id"], name: "index_articles_on_type_and_parent_id", using: :btree
+  add_index "articles", ["type", "profile_id"], name: "index_articles_on_type_and_profile_id", using: :btree
+  add_index "articles", ["type"], name: "index_articles_on_type", using: :btree
+
+  create_table "articles_categories", id: false, force: :cascade do |t|
     t.integer "article_id"
     t.integer "category_id"
-    t.boolean "virtual",     :default => false
-  end
-
-  add_index "articles_categories", ["article_id"], :name => "index_articles_categories_on_article_id"
-  add_index "articles_categories", ["category_id"], :name => "index_articles_categories_on_category_id"
-
-  create_table "badges_sashes", :force => true do |t|
-    t.integer  "badge_id"
-    t.integer  "sash_id"
-    t.boolean  "notified_user", :default => false
-    t.datetime "created_at"
+    t.boolean "virtual",     default: false
   end
-  add_index "badges_sashes", ["badge_id", "sash_id"], :name => "index_badges_sashes_on_badge_id_and_sash_id"
-  add_index "badges_sashes", ["badge_id"], :name => "index_badges_sashes_on_badge_id"
-  add_index "badges_sashes", ["sash_id"], :name => "index_badges_sashes_on_sash_id"
+  add_index "articles_categories", ["article_id"], name: "index_articles_categories_on_article_id", using: :btree
+  add_index "articles_categories", ["category_id"], name: "index_articles_categories_on_category_id", using: :btree
-  create_table "blocks", :force => true do |t|
+  create_table "blocks", force: :cascade do |t|
     t.string   "title"
     t.integer  "box_id"
     t.string   "type"
     t.text     "settings"
     t.integer  "position"
-    t.boolean  "enabled",         :default => true
+    t.boolean  "enabled",         default: true
     t.datetime "created_at"
     t.datetime "updated_at"
     t.datetime "fetched_at"
-    t.boolean  "mirror",          :default => false
+    t.boolean  "mirror",          default: false
     t.integer  "mirror_block_id"
     t.integer  "observers_id"
   end
-  add_index "blocks", ["box_id"], :name => "index_blocks_on_box_id"
-  add_index "blocks", ["enabled"], :name => "index_blocks_on_enabled"
-  add_index "blocks", ["fetched_at"], :name => "index_blocks_on_fetched_at"
-  add_index "blocks", ["type"], :name => "index_blocks_on_type"
+  add_index "blocks", ["box_id"], name: "index_blocks_on_box_id", using: :btree
+  add_index "blocks", ["enabled"], name: "index_blocks_on_enabled", using: :btree
+  add_index "blocks", ["fetched_at"], name: "index_blocks_on_fetched_at", using: :btree
+  add_index "blocks", ["type"], name: "index_blocks_on_type", using: :btree
-  create_table "boxes", :force => true do |t|
+  create_table "boxes", force: :cascade do |t|
     t.string  "owner_type"
     t.integer "owner_id"
     t.integer "position"
   end
-  add_index "boxes", ["owner_id", "owner_type"], :name => "index_boxes_on_owner_type_and_owner_id"
+  add_index "boxes", ["owner_id", "owner_type"], name: "index_boxes_on_owner_type_and_owner_id", using: :btree
-  create_table "categories", :force => true do |t|
+  create_table "categories", force: :cascade do |t|
     t.string  "name"
     t.string  "slug"
-    t.text    "path",                         :default => ""
+    t.text    "path",                      default: ""
     t.integer "environment_id"
     t.integer "parent_id"
     t.string  "type"
     t.float   "lat"
     t.float   "lng"
-    t.boolean "display_in_menu",              :default => false
-    t.integer "children_count",               :default => 0
-    t.boolean "accept_products",              :default => true
+    t.boolean "display_in_menu",           default: false
+    t.integer "children_count",            default: 0
+    t.boolean "accept_products",           default: true
     t.integer "image_id"
     t.string  "acronym"
     t.string  "abbreviation"
-    t.string  "display_color",   :limit => 6
+    t.string  "display_color",   limit: 6
     t.text    "ancestry"
   end
-  add_index "categories", ["parent_id"], :name => "index_categories_on_parent_id"
+  add_index "categories", ["parent_id"], name: "index_categories_on_parent_id", using: :btree
-  create_table "categories_profiles", :id => false, :force => true do |t|
+  create_table "categories_profiles", id: false, force: :cascade do |t|
     t.integer "profile_id"
     t.integer "category_id"
-    t.boolean "virtual",     :default => false
+    t.boolean "virtual",     default: false
   end
-  add_index "categories_profiles", ["category_id"], :name => "index_categories_profiles_on_category_id"
-  add_index "categories_profiles", ["profile_id"], :name => "index_categories_profiles_on_profile_id"
+  add_index "categories_profiles", ["category_id"], name: "index_categories_profiles_on_category_id", using: :btree
+  add_index "categories_profiles", ["profile_id"], name: "index_categories_profiles_on_profile_id", using: :btree
-  create_table "certifiers", :force => true do |t|
-    t.string   "name",           :null => false
+  create_table "certifiers", force: :cascade do |t|
+    t.string   "name",           null: false
     t.text     "description"
     t.string   "link"
     t.integer  "environment_id"
@@ -271,19 +247,19 @@ ActiveRecord::Schema.define(:version =&gt; 20150918005035) do
     t.datetime "updated_at"
   end
-  create_table "chat_messages", :force => true do |t|
-    t.integer  "from_id",    :null => false
-    t.integer  "to_id",      :null => false
+  create_table "chat_messages", force: :cascade do |t|
+    t.integer  "from_id",    null: false
+    t.integer  "to_id",      null: false
     t.text     "body"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
-  add_index "chat_messages", ["created_at"], :name => "index_chat_messages_on_created_at"
-  add_index "chat_messages", ["from_id"], :name => "index_chat_messages_on_from_id"
-  add_index "chat_messages", ["to_id"], :name => "index_chat_messages_on_to_id"
+  add_index "chat_messages", ["created_at"], name: "index_chat_messages_on_created_at", using: :btree
+  add_index "chat_messages", ["from_id"], name: "index_chat_messages_on_from_id", using: :btree
+  add_index "chat_messages", ["to_id"], name: "index_chat_messages_on_to_id", using: :btree
-  create_table "comments", :force => true do |t|
+  create_table "comments", force: :cascade do |t|
     t.string   "title"
     t.text     "body"
     t.integer  "source_id"
@@ -298,24 +274,49 @@ ActiveRecord::Schema.define(:version =&gt; 20150918005035) do
     t.string   "user_agent"
     t.string   "referrer"
     t.text     "settings"
-    t.integer  "paragraph_id"
-    t.string   "paragraph_uuid"
   end
-  add_index "comments", ["paragraph_uuid"], :name => "index_comments_on_paragraph_uuid"
-  add_index "comments", ["source_id", "spam"], :name => "index_comments_on_source_id_and_spam"
+  add_index "comments", ["source_id", "spam"], name: "index_comments_on_source_id_and_spam", using: :btree
-  create_table "contact_lists", :force => true do |t|
+  create_table "contact_lists", force: :cascade do |t|
     t.text     "list"
     t.string   "error_fetching"
-    t.boolean  "fetched",        :default => false
+    t.boolean  "fetched",        default: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "custom_field_values", force: :cascade do |t|
+    t.string   "customized_type", default: "",    null: false
+    t.integer  "customized_id",   default: 0,     null: false
+    t.boolean  "public",          default: false, null: false
+    t.integer  "custom_field_id", default: 0,     null: false
+    t.text     "value",           default: ""
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "custom_field_values", ["customized_type", "customized_id", "custom_field_id"], name: "index_custom_field_values", unique: true, using: :btree
+
+  create_table "custom_fields", force: :cascade do |t|
+    t.string   "name"
+    t.string   "format",          default: ""
+    t.text     "default_value",   default: ""
+    t.string   "customized_type"
+    t.text     "extras",          default: ""
+    t.boolean  "active",          default: false
+    t.boolean  "required",        default: false
+    t.boolean  "signup",          default: false
+    t.integer  "environment_id"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
-  create_table "delayed_jobs", :force => true do |t|
-    t.integer  "priority",   :default => 0
-    t.integer  "attempts",   :default => 0
+  add_index "custom_fields", ["customized_type", "name", "environment_id"], name: "index_custom_field", unique: true, using: :btree
+
+  create_table "delayed_jobs", force: :cascade do |t|
+    t.integer  "priority",   default: 0
+    t.integer  "attempts",   default: 0
     t.text     "handler"
     t.text     "last_error"
     t.datetime "run_at"
@@ -327,33 +328,22 @@ ActiveRecord::Schema.define(:version =&gt; 20150918005035) do
     t.string   "queue"
   end
-  add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
+  add_index "delayed_jobs", ["priority", "run_at"], name: "delayed_jobs_priority", using: :btree
-  create_table "domains", :force => true do |t|
+  create_table "domains", force: :cascade do |t|
     t.string  "name"
     t.string  "owner_type"
     t.integer "owner_id"
-    t.boolean "is_default",      :default => false
+    t.boolean "is_default",      default: false
     t.string  "google_maps_key"
   end
-  add_index "domains", ["is_default"], :name => "index_domains_on_is_default"
-  add_index "domains", ["name"], :name => "index_domains_on_name"
-  add_index "domains", ["owner_id", "owner_type", "is_default"], :name => "index_domains_on_owner_id_and_owner_type_and_is_default"
-  add_index "domains", ["owner_id", "owner_type"], :name => "index_domains_on_owner_id_and_owner_type"
-
-  create_table "email_templates", :force => true do |t|
-    t.string   "name"
-    t.string   "template_type"
-    t.string   "subject"
-    t.text     "body"
-    t.integer  "owner_id"
-    t.string   "owner_type"
-    t.datetime "created_at",    :null => false
-    t.datetime "updated_at",    :null => false
-  end
+  add_index "domains", ["is_default"], name: "index_domains_on_is_default", using: :btree
+  add_index "domains", ["name"], name: "index_domains_on_name", using: :btree
+  add_index "domains", ["owner_id", "owner_type", "is_default"], name: "index_domains_on_owner_id_and_owner_type_and_is_default", using: :btree
+  add_index "domains", ["owner_id", "owner_type"], name: "index_domains_on_owner_id_and_owner_type", using: :btree
-  create_table "environments", :force => true do |t|
+  create_table "environments", force: :cascade do |t|
     t.string   "name"
     t.string   "contact_email"
     t.boolean  "is_default"
@@ -361,73 +351,60 @@ ActiveRecord::Schema.define(:version =&gt; 20150918005035) do
     t.text     "design_data"
     t.text     "custom_header"
     t.text     "custom_footer"
-    t.string   "theme",                        :default => "default",              :null => false
+    t.string   "theme",                        default: "default",              null: false
     t.text     "terms_of_use_acceptance_text"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.integer  "reports_lower_bound",          :default => 0,                      :null => false
-    t.string   "redirection_after_login",      :default => "keep_on_same_page"
+    t.integer  "reports_lower_bound",          default: 0,                      null: false
+    t.string   "redirection_after_login",      default: "keep_on_same_page"
     t.text     "signup_welcome_text"
     t.string   "languages"
     t.string   "default_language"
     t.string   "noreply_email"
-    t.string   "redirection_after_signup",     :default => "keep_on_same_page"
-    t.text     "send_email_plugin_allow_to"
-    t.string   "date_format",                  :default => "month_name_with_year"
+    t.string   "redirection_after_signup",     default: "keep_on_same_page"
+    t.string   "date_format",                  default: "month_name_with_year"
   end
-  create_table "external_feeds", :force => true do |t|
+  create_table "external_feeds", force: :cascade do |t|
     t.string   "feed_title"
     t.datetime "fetched_at"
     t.text     "address"
-    t.integer  "blog_id",                         :null => false
-    t.boolean  "enabled",       :default => true, :null => false
-    t.boolean  "only_once",     :default => true, :null => false
+    t.integer  "blog_id",                      null: false
+    t.boolean  "enabled",       default: true, null: false
+    t.boolean  "only_once",     default: true, null: false
     t.datetime "created_at"
     t.datetime "updated_at"
     t.text     "error_message"
-    t.integer  "update_errors", :default => 0
+    t.integer  "update_errors", default: 0
   end
-  add_index "external_feeds", ["blog_id"], :name => "index_external_feeds_on_blog_id"
-  add_index "external_feeds", ["enabled"], :name => "index_external_feeds_on_enabled"
-  add_index "external_feeds", ["fetched_at"], :name => "index_external_feeds_on_fetched_at"
+  add_index "external_feeds", ["blog_id"], name: "index_external_feeds_on_blog_id", using: :btree
+  add_index "external_feeds", ["enabled"], name: "index_external_feeds_on_enabled", using: :btree
+  add_index "external_feeds", ["fetched_at"], name: "index_external_feeds_on_fetched_at", using: :btree
-  create_table "favorite_enterprise_people", :force => true do |t|
+  create_table "favorite_enterprise_people", force: :cascade do |t|
     t.integer  "person_id"
     t.integer  "enterprise_id"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
-  add_index "favorite_enterprise_people", ["enterprise_id"], :name => "index_favorite_enterprise_people_on_enterprise_id"
-  add_index "favorite_enterprise_people", ["person_id", "enterprise_id"], :name => "index_favorite_enterprise_people_on_person_id_and_enterprise_id"
-  add_index "favorite_enterprise_people", ["person_id"], :name => "index_favorite_enterprise_people_on_person_id"
+  add_index "favorite_enterprise_people", ["enterprise_id"], name: "index_favorite_enterprise_people_on_enterprise_id", using: :btree
+  add_index "favorite_enterprise_people", ["person_id", "enterprise_id"], name: "index_favorite_enterprise_people_on_person_id_and_enterprise_id", using: :btree
+  add_index "favorite_enterprise_people", ["person_id"], name: "index_favorite_enterprise_people_on_person_id", using: :btree
-  create_table "friendships", :force => true do |t|
+  create_table "friendships", force: :cascade do |t|
     t.integer  "person_id"
     t.integer  "friend_id"
     t.datetime "created_at"
     t.string   "group"
   end
-  add_index "friendships", ["friend_id"], :name => "index_friendships_on_friend_id"
-  add_index "friendships", ["person_id", "friend_id"], :name => "index_friendships_on_person_id_and_friend_id"
-  add_index "friendships", ["person_id"], :name => "index_friendships_on_person_id"
+  add_index "friendships", ["friend_id"], name: "index_friendships_on_friend_id", using: :btree
+  add_index "friendships", ["person_id", "friend_id"], name: "index_friendships_on_person_id_and_friend_id", using: :btree
+  add_index "friendships", ["person_id"], name: "index_friendships_on_person_id", using: :btree
-  create_table "gamification_plugin_badges", :force => true do |t|
-    t.string   "name"
-    t.integer  "level"
-    t.string   "description"
-    t.string   "custom_fields"
-    t.integer  "owner_id"
-    t.string   "owner_type"
-    t.datetime "created_at",    :null => false
-    t.datetime "updated_at",    :null => false
-    t.string   "title"
-  end
-
-  create_table "images", :force => true do |t|
+  create_table "images", force: :cascade do |t|
     t.integer "parent_id"
     t.string  "content_type"
     t.string  "filename"
@@ -435,43 +412,43 @@ ActiveRecord::Schema.define(:version =&gt; 20150918005035) do
     t.integer "size"
     t.integer "width"
     t.integer "height"
-    t.boolean "thumbnails_processed", :default => false
-    t.string  "label",                :default => ""
+    t.boolean "thumbnails_processed", default: false
+    t.string  "label",                default: ""
   end
-  add_index "images", ["parent_id"], :name => "index_images_on_parent_id"
+  add_index "images", ["parent_id"], name: "index_images_on_parent_id", using: :btree
-  create_table "inputs", :force => true do |t|
-    t.integer  "product_id",                                    :null => false
-    t.integer  "product_category_id",                           :null => false
+  create_table "inputs", force: :cascade do |t|
+    t.integer  "product_id",                                 null: false
+    t.integer  "product_category_id",                        null: false
     t.datetime "created_at"
     t.datetime "updated_at"
     t.integer  "position"
     t.decimal  "price_per_unit"
     t.decimal  "amount_used"
-    t.boolean  "relevant_to_price",          :default => true
-    t.boolean  "is_from_solidarity_economy", :default => false
+    t.boolean  "relevant_to_price",          default: true
+    t.boolean  "is_from_solidarity_economy", default: false
     t.integer  "unit_id"
   end
-  add_index "inputs", ["product_category_id"], :name => "index_inputs_on_product_category_id"
-  add_index "inputs", ["product_id"], :name => "index_inputs_on_product_id"
+  add_index "inputs", ["product_category_id"], name: "index_inputs_on_product_category_id", using: :btree
+  add_index "inputs", ["product_id"], name: "index_inputs_on_product_id", using: :btree
-  create_table "licenses", :force => true do |t|
-    t.string  "name",           :null => false
-    t.string  "slug",           :null => false
+  create_table "licenses", force: :cascade do |t|
+    t.string  "name",           null: false
+    t.string  "slug",           null: false
     t.string  "url"
-    t.integer "environment_id", :null => false
+    t.integer "environment_id", null: false
   end
-  create_table "mailing_sents", :force => true do |t|
+  create_table "mailing_sents", force: :cascade do |t|
     t.integer  "mailing_id"
     t.integer  "person_id"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
-  create_table "mailings", :force => true do |t|
+  create_table "mailings", force: :cascade do |t|
     t.string   "type"
     t.string   "subject"
     t.text     "body"
@@ -483,52 +460,11 @@ ActiveRecord::Schema.define(:version =&gt; 20150918005035) do
     t.datetime "updated_at"
   end
-  create_table "mark_comment_as_read_plugin", :force => true do |t|
-    t.integer "comment_id"
-    t.integer "person_id"
-  end
-
-  add_index "mark_comment_as_read_plugin", ["comment_id", "person_id"], :name => "index_mark_comment_as_read_plugin_on_comment_id_and_person_id", :unique => true
-
-  create_table "merit_actions", :force => true do |t|
-    t.integer  "user_id"
-    t.string   "action_method"
-    t.integer  "action_value"
-    t.boolean  "had_errors",    :default => false
-    t.string   "target_model"
-    t.integer  "target_id"
-    t.text     "target_data"
-    t.boolean  "processed",     :default => false
-    t.datetime "created_at",                       :null => false
-    t.datetime "updated_at",                       :null => false
-  end
-
-  create_table "merit_activity_logs", :force => true do |t|
-    t.integer  "action_id"
-    t.string   "related_change_type"
-    t.integer  "related_change_id"
-    t.string   "description"
-    t.datetime "created_at"
-  end
-
-  create_table "merit_score_points", :force => true do |t|
-    t.integer  "score_id"
-    t.integer  "num_points", :default => 0
-    t.string   "log"
-    t.datetime "created_at"
-    t.integer  "action_id"
-  end
-
-  create_table "merit_scores", :force => true do |t|
-    t.integer "sash_id"
-    t.string  "category", :default => "default"
-  end
-
-  create_table "national_region_types", :force => true do |t|
+  create_table "national_region_types", force: :cascade do |t|
     t.string "name"
   end
-  create_table "national_regions", :force => true do |t|
+  create_table "national_regions", force: :cascade do |t|
     t.string   "name"
     t.string   "national_region_code"
     t.string   "parent_national_region_code"
@@ -537,27 +473,18 @@ ActiveRecord::Schema.define(:version =&gt; 20150918005035) do
     t.integer  "national_region_type_id"
   end
-  add_index "national_regions", ["name"], :name => "name_index"
-  add_index "national_regions", ["national_region_code"], :name => "code_index"
-
-  create_table "pairwise_plugin_choices_related", :force => true do |t|
-    t.integer  "choice_id"
-    t.integer  "parent_choice_id"
-    t.integer  "question_id"
-    t.integer  "user_id"
-    t.datetime "created_at",       :null => false
-    t.datetime "updated_at",       :null => false
-  end
+  add_index "national_regions", ["name"], name: "name_index", using: :btree
+  add_index "national_regions", ["national_region_code"], name: "code_index", using: :btree
-  create_table "price_details", :force => true do |t|
-    t.decimal  "price",              :default => 0.0
+  create_table "price_details", force: :cascade do |t|
+    t.decimal  "price",              default: 0.0
     t.integer  "product_id"
     t.integer  "production_cost_id"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
-  create_table "product_qualifiers", :force => true do |t|
+  create_table "product_qualifiers", force: :cascade do |t|
     t.integer  "product_id"
     t.integer  "qualifier_id"
     t.integer  "certifier_id"
@@ -565,11 +492,11 @@ ActiveRecord::Schema.define(:version =&gt; 20150918005035) do
     t.datetime "updated_at"
   end
-  add_index "product_qualifiers", ["certifier_id"], :name => "index_product_qualifiers_on_certifier_id"
-  add_index "product_qualifiers", ["product_id"], :name => "index_product_qualifiers_on_product_id"
-  add_index "product_qualifiers", ["qualifier_id"], :name => "index_product_qualifiers_on_qualifier_id"
+  add_index "product_qualifiers", ["certifier_id"], name: "index_product_qualifiers_on_certifier_id", using: :btree
+  add_index "product_qualifiers", ["product_id"], name: "index_product_qualifiers_on_product_id", using: :btree
+  add_index "product_qualifiers", ["qualifier_id"], name: "index_product_qualifiers_on_qualifier_id", using: :btree
-  create_table "production_costs", :force => true do |t|
+  create_table "production_costs", force: :cascade do |t|
     t.string   "name"
     t.integer  "owner_id"
     t.string   "owner_type"
@@ -577,7 +504,7 @@ ActiveRecord::Schema.define(:version =&gt; 20150918005035) do
     t.datetime "updated_at"
   end
-  create_table "products", :force => true do |t|
+  create_table "products", force: :cascade do |t|
     t.integer  "profile_id"
     t.integer  "product_category_id"
     t.string   "name"
@@ -586,52 +513,52 @@ ActiveRecord::Schema.define(:version =&gt; 20150918005035) do
     t.datetime "created_at"
     t.datetime "updated_at"
     t.decimal  "discount"
-    t.boolean  "available",           :default => true
-    t.boolean  "highlighted",         :default => false
+    t.boolean  "available",           default: true
+    t.boolean  "highlighted",         default: false
     t.integer  "unit_id"
     t.integer  "image_id"
     t.string   "type"
     t.text     "data"
-    t.boolean  "archived",            :default => false
+    t.boolean  "archived",            default: false
   end
-  add_index "products", ["created_at"], :name => "index_products_on_created_at"
-  add_index "products", ["product_category_id"], :name => "index_products_on_product_category_id"
-  add_index "products", ["profile_id"], :name => "index_products_on_profile_id"
+  add_index "products", ["created_at"], name: "index_products_on_created_at", using: :btree
+  add_index "products", ["product_category_id"], name: "index_products_on_product_category_id", using: :btree
+  add_index "products", ["profile_id"], name: "index_products_on_profile_id", using: :btree
-  create_table "profile_activities", :force => true do |t|
+  create_table "profile_activities", force: :cascade do |t|
     t.integer  "profile_id"
     t.integer  "activity_id"
     t.string   "activity_type"
-    t.datetime "created_at",    :null => false
-    t.datetime "updated_at",    :null => false
+    t.datetime "created_at",    null: false
+    t.datetime "updated_at",    null: false
   end
-  add_index "profile_activities", ["activity_id", "activity_type"], :name => "index_profile_activities_on_activity_id_and_activity_type"
-  add_index "profile_activities", ["activity_type"], :name => "index_profile_activities_on_activity_type"
-  add_index "profile_activities", ["profile_id"], :name => "index_profile_activities_on_profile_id"
+  add_index "profile_activities", ["activity_id", "activity_type"], name: "index_profile_activities_on_activity_id_and_activity_type", using: :btree
+  add_index "profile_activities", ["activity_type"], name: "index_profile_activities_on_activity_type", using: :btree
+  add_index "profile_activities", ["profile_id"], name: "index_profile_activities_on_profile_id", using: :btree
-  create_table "profile_suggestions", :force => true do |t|
+  create_table "profile_suggestions", force: :cascade do |t|
     t.integer  "person_id"
     t.integer  "suggestion_id"
     t.string   "suggestion_type"
     t.text     "categories"
-    t.boolean  "enabled",         :default => true
-    t.float    "score",           :default => 0.0
-    t.datetime "created_at",                        :null => false
-    t.datetime "updated_at",                        :null => false
+    t.boolean  "enabled",         default: true
+    t.float    "score",           default: 0.0
+    t.datetime "created_at",                     null: false
+    t.datetime "updated_at",                     null: false
   end
-  add_index "profile_suggestions", ["person_id"], :name => "index_profile_suggestions_on_person_id"
-  add_index "profile_suggestions", ["score"], :name => "index_profile_suggestions_on_score"
-  add_index "profile_suggestions", ["suggestion_id"], :name => "index_profile_suggestions_on_suggestion_id"
+  add_index "profile_suggestions", ["person_id"], name: "index_profile_suggestions_on_person_id", using: :btree
+  add_index "profile_suggestions", ["score"], name: "index_profile_suggestions_on_score", using: :btree
+  add_index "profile_suggestions", ["suggestion_id"], name: "index_profile_suggestions_on_suggestion_id", using: :btree
-  create_table "profiles", :force => true do |t|
+  create_table "profiles", force: :cascade do |t|
     t.string   "name"
     t.string   "type"
     t.string   "identifier"
     t.integer  "environment_id"
-    t.boolean  "active",                                :default => true
+    t.boolean  "active",                             default: true
     t.string   "address"
     t.string   "contact_phone"
     t.integer  "home_page_id"
@@ -642,103 +569,67 @@ ActiveRecord::Schema.define(:version =&gt; 20150918005035) do
     t.float    "lat"
     t.float    "lng"
     t.integer  "geocode_precision"
-    t.boolean  "enabled",                               :default => true
-    t.string   "nickname",                :limit => 16
+    t.boolean  "enabled",                            default: true
+    t.string   "nickname",                limit: 16
     t.text     "custom_header"
     t.text     "custom_footer"
     t.string   "theme"
-    t.boolean  "public_profile",                        :default => true
+    t.boolean  "public_profile",                     default: true
     t.date     "birth_date"
     t.integer  "preferred_domain_id"
     t.datetime "updated_at"
-    t.boolean  "visible",                               :default => true
+    t.boolean  "visible",                            default: true
     t.integer  "image_id"
-    t.boolean  "validated",                             :default => true
+    t.boolean  "validated",                          default: true
     t.string   "cnpj"
     t.string   "national_region_code"
-    t.boolean  "is_template",                           :default => false
+    t.boolean  "is_template",                        default: false
     t.integer  "template_id"
     t.string   "redirection_after_login"
-    t.integer  "friends_count",                         :default => 0,     :null => false
-    t.integer  "members_count",                         :default => 0,     :null => false
-    t.integer  "activities_count",                      :default => 0,     :null => false
+    t.integer  "friends_count",                      default: 0,     null: false
+    t.integer  "members_count",                      default: 0,     null: false
+    t.integer  "activities_count",                   default: 0,     null: false
     t.string   "personal_website"
     t.string   "jabber_id"
     t.integer  "welcome_page_id"
-    t.boolean  "allow_members_to_invite",               :default => true
-    t.boolean  "invite_friends_only",                   :default => false
-    t.boolean  "secret",                                :default => false
-    t.integer  "sash_id"
-    t.integer  "level",                                 :default => 0
-  end
-
-  add_index "profiles", ["activities_count"], :name => "index_profiles_on_activities_count"
-  add_index "profiles", ["created_at"], :name => "index_profiles_on_created_at"
-  add_index "profiles", ["enabled"], :name => "index_profiles_on_enabled"
-  add_index "profiles", ["environment_id"], :name => "index_profiles_on_environment_id"
-  add_index "profiles", ["friends_count"], :name => "index_profiles_on_friends_count"
-  add_index "profiles", ["identifier"], :name => "index_profiles_on_identifier"
-  add_index "profiles", ["members_count"], :name => "index_profiles_on_members_count"
-  add_index "profiles", ["region_id"], :name => "index_profiles_on_region_id"
-  add_index "profiles", ["type"], :name => "index_profiles_on_type"
-  add_index "profiles", ["user_id", "type"], :name => "index_profiles_on_user_id_and_type"
-  add_index "profiles", ["user_id"], :name => "index_profiles_on_user_id"
-  add_index "profiles", ["validated"], :name => "index_profiles_on_validated"
-  add_index "profiles", ["visible"], :name => "index_profiles_on_visible"
-
-  create_table "proposals_discussion_plugin_proposal_evaluations", :force => true do |t|
-    t.integer  "proposal_task_id"
-    t.integer  "evaluator_id"
-    t.integer  "flagged_status"
-    t.datetime "created_at",       :null => false
-    t.datetime "updated_at",       :null => false
-  end
-
-  add_index "proposals_discussion_plugin_proposal_evaluations", ["evaluator_id"], :name => "index_proposals_discussion_plugin_proposal_evaluator_id"
-  add_index "proposals_discussion_plugin_proposal_evaluations", ["proposal_task_id"], :name => "index_proposals_discussion_plugin_proposal_task_id"
-
-  create_table "proposals_discussion_plugin_ranking_items", :force => true do |t|
-    t.integer  "position"
-    t.string   "abstract"
-    t.integer  "votes_for"
-    t.integer  "votes_against"
-    t.integer  "hits"
-    t.decimal  "effective_support"
-    t.integer  "proposal_id"
-    t.datetime "created_at",        :null => false
-    t.datetime "updated_at",        :null => false
-  end
-
-  add_index "proposals_discussion_plugin_ranking_items", ["proposal_id"], :name => "index_proposals_discussion_plugin_ranking_proposal_id"
-
-  create_table "proposals_discussion_plugin_task_categories", :id => false, :force => true do |t|
-    t.integer "task_id"
-    t.integer "category_id"
-  end
-
-  create_table "qualifier_certifiers", :force => true do |t|
+    t.boolean  "allow_members_to_invite",            default: true
+    t.boolean  "invite_friends_only",                default: false
+    t.boolean  "secret",                             default: false
+  end
+
+  add_index "profiles", ["activities_count"], name: "index_profiles_on_activities_count", using: :btree
+  add_index "profiles", ["created_at"], name: "index_profiles_on_created_at", using: :btree
+  add_index "profiles", ["environment_id"], name: "index_profiles_on_environment_id", using: :btree
+  add_index "profiles", ["friends_count"], name: "index_profiles_on_friends_count", using: :btree
+  add_index "profiles", ["identifier"], name: "index_profiles_on_identifier", using: :btree
+  add_index "profiles", ["members_count"], name: "index_profiles_on_members_count", using: :btree
+  add_index "profiles", ["region_id"], name: "index_profiles_on_region_id", using: :btree
+  add_index "profiles", ["user_id", "type"], name: "index_profiles_on_user_id_and_type", using: :btree
+  add_index "profiles", ["user_id"], name: "index_profiles_on_user_id", using: :btree
+
+  create_table "qualifier_certifiers", force: :cascade do |t|
     t.integer "qualifier_id"
     t.integer "certifier_id"
   end
-  create_table "qualifiers", :force => true do |t|
-    t.string   "name",           :null => false
+  create_table "qualifiers", force: :cascade do |t|
+    t.string   "name",           null: false
     t.integer  "environment_id"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
-  create_table "refused_join_community", :id => false, :force => true do |t|
+  create_table "refused_join_community", id: false, force: :cascade do |t|
     t.integer "person_id"
     t.integer "community_id"
   end
-  create_table "region_validators", :id => false, :force => true do |t|
+  create_table "region_validators", id: false, force: :cascade do |t|
     t.integer "region_id"
     t.integer "organization_id"
   end
-  create_table "reported_images", :force => true do |t|
+  create_table "reported_images", force: :cascade do |t|
     t.integer "size"
     t.string  "content_type"
     t.string  "filename"
@@ -747,36 +638,25 @@ ActiveRecord::Schema.define(:version =&gt; 20150918005035) do
     t.integer "abuse_report_id"
   end
-  create_table "role_assignments", :force => true do |t|
-    t.integer "accessor_id",   :null => false
+  create_table "role_assignments", force: :cascade do |t|
+    t.integer "accessor_id",   null: false
     t.string  "accessor_type"
     t.integer "resource_id"
     t.string  "resource_type"
-    t.integer "role_id",       :null => false
+    t.integer "role_id",       null: false
     t.boolean "is_global"
   end
-  add_index "role_assignments", ["accessor_id", "accessor_type", "resource_id", "resource_type"], :name => "index_on_role_assigments_accessor_resource_role"
-  add_index "role_assignments", ["accessor_id", "accessor_type", "role_id"], :name => "index_on_role_assigments_accessor_role"
-  add_index "role_assignments", ["accessor_id", "accessor_type"], :name => "index_role_assignments_on_accessor_id_and_accessor_type"
-  add_index "role_assignments", ["resource_id", "resource_type", "role_id"], :name => "index_on_role_assigments_resource_role"
-  add_index "role_assignments", ["resource_id", "resource_type"], :name => "index_role_assignments_on_resource_id_and_resource_type"
-
-  create_table "roles", :force => true do |t|
+  create_table "roles", force: :cascade do |t|
     t.string  "name"
     t.string  "key"
-    t.boolean "system",         :default => false
+    t.boolean "system",         default: false
     t.text    "permissions"
     t.integer "environment_id"
     t.integer "profile_id"
   end
-  create_table "sashes", :force => true do |t|
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "scraps", :force => true do |t|
+  create_table "scraps", force: :cascade do |t|
     t.text     "content"
     t.integer  "sender_id"
     t.integer  "receiver_id"
@@ -786,104 +666,104 @@ ActiveRecord::Schema.define(:version =&gt; 20150918005035) do
     t.integer  "context_id"
   end
-  create_table "search_term_occurrences", :force => true do |t|
+  create_table "search_term_occurrences", force: :cascade do |t|
     t.integer  "search_term_id"
     t.datetime "created_at"
-    t.integer  "total",          :default => 0
-    t.integer  "indexed",        :default => 0
+    t.integer  "total",          default: 0
+    t.integer  "indexed",        default: 0
   end
-  add_index "search_term_occurrences", ["created_at"], :name => "index_search_term_occurrences_on_created_at"
+  add_index "search_term_occurrences", ["created_at"], name: "index_search_term_occurrences_on_created_at", using: :btree
-  create_table "search_terms", :force => true do |t|
+  create_table "search_terms", force: :cascade do |t|
     t.string  "term"
     t.integer "context_id"
     t.string  "context_type"
-    t.string  "asset",            :default => "all"
-    t.float   "score",            :default => 0.0
-    t.float   "relevance_score",  :default => 0.0
-    t.float   "occurrence_score", :default => 0.0
+    t.string  "asset",            default: "all"
+    t.float   "score",            default: 0.0
+    t.float   "relevance_score",  default: 0.0
+    t.float   "occurrence_score", default: 0.0
   end
-  add_index "search_terms", ["asset"], :name => "index_search_terms_on_asset"
-  add_index "search_terms", ["occurrence_score"], :name => "index_search_terms_on_occurrence_score"
-  add_index "search_terms", ["relevance_score"], :name => "index_search_terms_on_relevance_score"
-  add_index "search_terms", ["score"], :name => "index_search_terms_on_score"
-  add_index "search_terms", ["term"], :name => "index_search_terms_on_term"
+  add_index "search_terms", ["asset"], name: "index_search_terms_on_asset", using: :btree
+  add_index "search_terms", ["occurrence_score"], name: "index_search_terms_on_occurrence_score", using: :btree
+  add_index "search_terms", ["relevance_score"], name: "index_search_terms_on_relevance_score", using: :btree
+  add_index "search_terms", ["score"], name: "index_search_terms_on_score", using: :btree
+  add_index "search_terms", ["term"], name: "index_search_terms_on_term", using: :btree
-  create_table "sessions", :force => true do |t|
-    t.string   "session_id", :null => false
+  create_table "sessions", force: :cascade do |t|
+    t.string   "session_id", null: false
     t.text     "data"
     t.datetime "created_at"
     t.datetime "updated_at"
     t.integer  "user_id"
   end
-  add_index "sessions", ["session_id"], :name => "index_sessions_on_session_id"
-  add_index "sessions", ["updated_at"], :name => "index_sessions_on_updated_at"
-  add_index "sessions", ["user_id"], :name => "index_sessions_on_user_id"
+  add_index "sessions", ["session_id"], name: "index_sessions_on_session_id", using: :btree
+  add_index "sessions", ["updated_at"], name: "index_sessions_on_updated_at", using: :btree
+  add_index "sessions", ["user_id"], name: "index_sessions_on_user_id", using: :btree
-  create_table "suggestion_connections", :force => true do |t|
-    t.integer "suggestion_id",   :null => false
-    t.integer "connection_id",   :null => false
-    t.string  "connection_type", :null => false
+  create_table "suggestion_connections", force: :cascade do |t|
+    t.integer "suggestion_id",   null: false
+    t.integer "connection_id",   null: false
+    t.string  "connection_type", null: false
   end
-  create_table "taggings", :force => true do |t|
+  create_table "taggings", force: :cascade do |t|
     t.integer  "tag_id"
     t.integer  "taggable_id"
     t.string   "taggable_type"
     t.datetime "created_at"
     t.integer  "tagger_id"
     t.string   "tagger_type"
-    t.string   "context",       :limit => 128
+    t.string   "context",       limit: 128
   end
-  add_index "taggings", ["tag_id", "taggable_id", "taggable_type", "context", "tagger_id", "tagger_type"], :name => "taggings_idx", :unique => true
-  add_index "taggings", ["taggable_id", "taggable_type", "context"], :name => "index_taggings_on_taggable_id_and_taggable_type_and_context"
-  add_index "taggings", ["taggable_id", "taggable_type"], :name => "index_taggings_on_taggable_id_and_taggable_type"
+  add_index "taggings", ["tag_id", "taggable_id", "taggable_type", "context", "tagger_id", "tagger_type"], name: "taggings_idx", unique: true, using: :btree
+  add_index "taggings", ["taggable_id", "taggable_type", "context"], name: "index_taggings_on_taggable_id_and_taggable_type_and_context", using: :btree
+  add_index "taggings", ["taggable_id", "taggable_type"], name: "index_taggings_on_taggable_id_and_taggable_type", using: :btree
-  create_table "tags", :force => true do |t|
+  create_table "tags", force: :cascade do |t|
     t.string  "name"
     t.integer "parent_id"
-    t.boolean "pending",        :default => false
-    t.integer "taggings_count", :default => 0
+    t.boolean "pending",        default: false
+    t.integer "taggings_count", default: 0
   end
-  add_index "tags", ["name"], :name => "index_tags_on_name", :unique => true
-  add_index "tags", ["parent_id"], :name => "index_tags_on_parent_id"
+  add_index "tags", ["name"], name: "index_tags_on_name", unique: true, using: :btree
+  add_index "tags", ["parent_id"], name: "index_tags_on_parent_id", using: :btree
-  create_table "tasks", :force => true do |t|
+  create_table "tasks", force: :cascade do |t|
     t.text     "data"
     t.integer  "status"
-    t.datetime "end_date"
+    t.date     "end_date"
     t.integer  "requestor_id"
     t.integer  "target_id"
-    t.string   "code",           :limit => 40
+    t.string   "code",           limit: 40
     t.string   "type"
     t.datetime "created_at"
     t.string   "target_type"
     t.integer  "image_id"
-    t.boolean  "spam",                         :default => false
+    t.boolean  "spam",                      default: false
     t.integer  "responsible_id"
     t.integer  "closed_by_id"
   end
-  add_index "tasks", ["requestor_id"], :name => "index_tasks_on_requestor_id"
-  add_index "tasks", ["spam"], :name => "index_tasks_on_spam"
-  add_index "tasks", ["status"], :name => "index_tasks_on_status"
-  add_index "tasks", ["target_id", "target_type"], :name => "index_tasks_on_target_id_and_target_type"
-  add_index "tasks", ["target_id"], :name => "index_tasks_on_target_id"
-  add_index "tasks", ["target_type"], :name => "index_tasks_on_target_type"
+  add_index "tasks", ["requestor_id"], name: "index_tasks_on_requestor_id", using: :btree
+  add_index "tasks", ["spam"], name: "index_tasks_on_spam", using: :btree
+  add_index "tasks", ["status"], name: "index_tasks_on_status", using: :btree
+  add_index "tasks", ["target_id", "target_type"], name: "index_tasks_on_target_id_and_target_type", using: :btree
+  add_index "tasks", ["target_id"], name: "index_tasks_on_target_id", using: :btree
+  add_index "tasks", ["target_type"], name: "index_tasks_on_target_type", using: :btree
-  create_table "terms_forum_people", :id => false, :force => true do |t|
+  create_table "terms_forum_people", id: false, force: :cascade do |t|
     t.integer "forum_id"
     t.integer "person_id"
   end
-  add_index "terms_forum_people", ["forum_id", "person_id"], :name => "index_terms_forum_people_on_forum_id_and_person_id"
+  add_index "terms_forum_people", ["forum_id", "person_id"], name: "index_terms_forum_people_on_forum_id_and_person_id", using: :btree
-  create_table "thumbnails", :force => true do |t|
+  create_table "thumbnails", force: :cascade do |t|
     t.integer "size"
     t.string  "content_type"
     t.string  "filename"
@@ -893,33 +773,33 @@ ActiveRecord::Schema.define(:version =&gt; 20150918005035) do
     t.string  "thumbnail"
   end
-  add_index "thumbnails", ["parent_id"], :name => "index_thumbnails_on_parent_id"
+  add_index "thumbnails", ["parent_id"], name: "index_thumbnails_on_parent_id", using: :btree
-  create_table "units", :force => true do |t|
-    t.string  "singular",       :null => false
-    t.string  "plural",         :null => false
+  create_table "units", force: :cascade do |t|
+    t.string  "singular",       null: false
+    t.string  "plural",         null: false
     t.integer "position"
-    t.integer "environment_id", :null => false
+    t.integer "environment_id", null: false
   end
-  create_table "users", :force => true do |t|
+  create_table "users", force: :cascade do |t|
     t.string   "login"
     t.string   "email"
-    t.string   "crypted_password",           :limit => 40
-    t.string   "salt",                       :limit => 40
+    t.string   "crypted_password",           limit: 40
+    t.string   "salt",                       limit: 40
     t.datetime "created_at"
     t.datetime "updated_at"
     t.string   "remember_token"
     t.datetime "remember_token_expires_at"
     t.text     "terms_of_use"
-    t.string   "terms_accepted",             :limit => 1
+    t.string   "terms_accepted",             limit: 1
     t.integer  "environment_id"
     t.string   "password_type"
-    t.boolean  "enable_email",                             :default => false
-    t.string   "last_chat_status",                         :default => ""
-    t.string   "chat_status",                              :default => ""
+    t.boolean  "enable_email",                          default: false
+    t.string   "last_chat_status",                      default: ""
+    t.string   "chat_status",                           default: ""
     t.datetime "chat_status_at"
-    t.string   "activation_code",            :limit => 40
+    t.string   "activation_code",            limit: 40
     t.datetime "activated_at"
     t.string   "return_to"
     t.datetime "last_login_at"
@@ -927,23 +807,23 @@ ActiveRecord::Schema.define(:version =&gt; 20150918005035) do
     t.datetime "private_token_generated_at"
   end
-  create_table "validation_infos", :force => true do |t|
+  create_table "validation_infos", force: :cascade do |t|
     t.text    "validation_methodology"
     t.text    "restrictions"
     t.integer "organization_id"
   end
-  create_table "votes", :force => true do |t|
-    t.integer  "vote",          :null => false
-    t.integer  "voteable_id",   :null => false
-    t.string   "voteable_type", :null => false
+  create_table "votes", force: :cascade do |t|
+    t.integer  "vote",          null: false
+    t.integer  "voteable_id",   null: false
+    t.string   "voteable_type", null: false
     t.integer  "voter_id"
     t.string   "voter_type"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
-  add_index "votes", ["voteable_id", "voteable_type"], :name => "fk_voteables"
-  add_index "votes", ["voter_id", "voter_type"], :name => "fk_voters"
+  add_index "votes", ["voteable_id", "voteable_type"], name: "fk_voteables", using: :btree
+  add_index "votes", ["voter_id", "voter_type"], name: "fk_voters", using: :btree
 end
@@ -8,14 +8,7 @@ dbc_go noosfero $@
 #DEBHELPER#
-# some dirty work is needed after Noosfero is stopped
 if [ "$1" = "upgrade" ]; then
-  # delete cached files
-  rm -f /var/lib/noosfero-data/cache/*
-
-  # restart memcache
-  invoke-rc.d memcached restart
-
   # stop debconf to avoid the problem with infinite hanging, cfe
   # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=295477
   db_stop
@@ -25,7 +25,7 @@ override_dh_auto_install:
 	debian/filter-gemfile > $(CURDIR)/debian/noosfero/usr/share/noosfero/Gemfile
 override_dh_installinit:
-	dh_installinit -pnoosfero --onlyscripts
+	dh_installinit -pnoosfero --onlyscripts --restart-after-upgrade
 override_dh_clean:
 	dh_clean
@@ -118,11 +118,7 @@ end
 Then /^(?:|I )should see "([^"]*)"(?: within "([^"]*)")?$/ do |text, selector|
   with_scope(selector) do
-    if page.respond_to? :should
-      page.should have_content(text)
-    else
-      assert page.has_content?(text)
-    end
+    expect(page).to have_content(text)
   end
 end
@@ -17,6 +17,11 @@
   margin-left: 10px;
 }
+#newsletter-moderation-preview th {
+  padding: 0px;
+  border: 0px;
+}
+
 #newsletter-moderation-preview input[type=checkbox] {
   margin-left: -27px;
   margin-top: 16px;
-require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require 'test_helper'
 class NewsletterPluginAdminControllerTest < ActionController::TestCase
-require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require 'test_helper'
 class NewsletterPluginControllerTest < ActionController::TestCase
@@ -3,14 +3,14 @@
 <h1><%= _('Check posts you want to include') %></h1>
 <div id='newsletter-moderation-preview'>
-  <% newsletter_content = newsletter.body.gsub(/width: 640px;/,'').sub(/#{NewsletterPlugin::Newsletter::CSS['breaking-news-wrap']}/, '') %>
+  <% newsletter_content = newsletter.body.gsub(/width: 640px;/,'').sub(/#{NewsletterPlugin::Newsletter::CSS['breakingnews-wrap']}/, '') %>
   <% newsletter.posts.each do |post| %>
     <% input_name = "tasks[#{task.id}][task][post_ids][]" %>
     <% post_check_box = hidden_field_tag(input_name, '0') +check_box_tag(input_name, post.id, true) %>
-    <% newsletter_content.gsub!(/<span id="#{post.id}"/, post_check_box+ '<span') %>
-    <% newsletter_content.gsub!(/<img id="#{post.id}"/, post_check_box+ '<img') %>
+    <% newsletter_content.gsub!(/<span([^>]*?) id="#{post.id}"/, post_check_box + '<span\\1')%>
+    <% newsletter_content.gsub!(/<img([^>]*?) id="#{post.id}"/, post_check_box + '<img\\1') %>
   <% end %>
   <%= newsletter_content %>
@@ -43,6 +43,7 @@ class OrganizationRatingsPluginProfileController &lt; ProfileController
     rating.value = params[:organization_rating_value] if params[:organization_rating_value]
     if rating.save
+      @plugins.dispatch(:organization_ratings_plugin_rating_created, rating, params)
       create_rating_comment(rating)
       session[:notice] = _("%s successfully rated!") % profile.name
     else
@@ -25,6 +25,10 @@ class OrganizationRatingsPlugin &lt; Noosfero::Plugin
     def organization_ratings_plugin_extra_fields_show_data user_rating
       nil
     end
+
+    def organization_ratings_plugin_rating_created rating, params
+      nil
+    end
   end
   # Plugin Hotspot to display the average rating
@@ -5,7 +5,7 @@ module SnifferPlugin::Helper
   def filter_visible_attr_profile(profile)
     filtered_profile = {}
     visible_attributes = [:id, :name, :lat, :lng, :sniffer_plugin_distance]
-    visible_attributes.each{ |a| filtered_profile[a] = profile[a] || 0 }
+    visible_attributes.each{ |a| filtered_profile[a] = profile.send(a) || 0 }
     filtered_profile
   end
@@ -30,7 +30,8 @@ class SearchTest &lt; ActiveSupport::TestCase
     assert_empty json['articles']
   end
-  should 'do not list articles of wrong type' do
+  should 'not list articles of wrong type' do
+    Article.delete_all
     fast_create(Article, :profile_id => person.id)
     get "/api/v1/search/article?type=TinyMceArticle"
     json = JSON.parse(last_response.body)
	@@ -44,7 +44,7 @@ Noosfero::Application.configure do		@@ -44,7 +44,7 @@ Noosfero::Application.configure do
44	# config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)	44	# config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
45		45
46	# Use a different cache store in production	46	# Use a different cache store in production
47	- config.cache_store = :dalli_store, "127.0.0.1:11211"	47	+ config.cache_store = :dalli_store, "127.0.0.1:11211", { :namespace => "noosfero/#{Noosfero::VERSION}" }
48		48
49	# Enable serving of images, stylesheets, and javascripts from an asset server	49	# Enable serving of images, stylesheets, and javascripts from an asset server
50	# config.action_controller.asset_host = "http://assets.example.com"	50	# config.action_controller.asset_host = "http://assets.example.com"
	@@ -8,14 +8,7 @@ dbc_go noosfero $@		@@ -8,14 +8,7 @@ dbc_go noosfero $@
8		8
9	#DEBHELPER#	9	#DEBHELPER#
10		10
11	-# some dirty work is needed after Noosfero is stopped
12	if [ "$1" = "upgrade" ]; then	11	if [ "$1" = "upgrade" ]; then
13	- # delete cached files
14	- rm -f /var/lib/noosfero-data/cache/*
15	-
16	- # restart memcache
17	- invoke-rc.d memcached restart
18	-
19	# stop debconf to avoid the problem with infinite hanging, cfe	12	# stop debconf to avoid the problem with infinite hanging, cfe
20	# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=295477	13	# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=295477
21	db_stop	14	db_stop
	@@ -25,7 +25,7 @@ override_dh_auto_install:		@@ -25,7 +25,7 @@ override_dh_auto_install:
25	debian/filter-gemfile > $(CURDIR)/debian/noosfero/usr/share/noosfero/Gemfile	25	debian/filter-gemfile > $(CURDIR)/debian/noosfero/usr/share/noosfero/Gemfile
26		26
27	override_dh_installinit:	27	override_dh_installinit:
28	- dh_installinit -pnoosfero --onlyscripts	28	+ dh_installinit -pnoosfero --onlyscripts --restart-after-upgrade
29		29
30	override_dh_clean:	30	override_dh_clean:
31	dh_clean	31	dh_clean
	@@ -118,11 +118,7 @@ end		@@ -118,11 +118,7 @@ end
118		118
119	Then /^(?:\|I )should see "([^"])"(?: within "([^"])")?$/ do \|text, selector\|	119	Then /^(?:\|I )should see "([^"])"(?: within "([^"])")?$/ do \|text, selector\|
120	with_scope(selector) do	120	with_scope(selector) do
121	- if page.respond_to? :should
122	- page.should have_content(text)
123	- else
124	- assert page.has_content?(text)
125	- end	121	+ expect(page).to have_content(text)
126	end	122	end
127	end	123	end
128		124
1	-require File.dirname(__FILE__) + '/../../../../test/test_helper'	1	+require 'test_helper'
2		2
3	class NewsletterPluginAdminControllerTest < ActionController::TestCase	3	class NewsletterPluginAdminControllerTest < ActionController::TestCase
4		4
1	-require File.dirname(__FILE__) + '/../../../../test/test_helper'	1	+require 'test_helper'
2		2
3	class NewsletterPluginControllerTest < ActionController::TestCase	3	class NewsletterPluginControllerTest < ActionController::TestCase
4		4
	@@ -43,6 +43,7 @@ class OrganizationRatingsPluginProfileController < ProfileController		@@ -43,6 +43,7 @@ class OrganizationRatingsPluginProfileController < ProfileController
43	rating.value = params[:organization_rating_value] if params[:organization_rating_value]	43	rating.value = params[:organization_rating_value] if params[:organization_rating_value]
44		44
45	if rating.save	45	if rating.save
		46	+ @plugins.dispatch(:organization_ratings_plugin_rating_created, rating, params)
46	create_rating_comment(rating)	47	create_rating_comment(rating)
47	session[:notice] = _("%s successfully rated!") % profile.name	48	session[:notice] = _("%s successfully rated!") % profile.name
48	else	49	else
	@@ -5,7 +5,7 @@ module SnifferPlugin::Helper		@@ -5,7 +5,7 @@ module SnifferPlugin::Helper
5	def filter_visible_attr_profile(profile)	5	def filter_visible_attr_profile(profile)
6	filtered_profile = {}	6	filtered_profile = {}
7	visible_attributes = [:id, :name, :lat, :lng, :sniffer_plugin_distance]	7	visible_attributes = [:id, :name, :lat, :lng, :sniffer_plugin_distance]
8	- visible_attributes.each{ \|a\| filtered_profile[a] = profile[a] \|\| 0 }	8	+ visible_attributes.each{ \|a\| filtered_profile[a] = profile.send(a) \|\| 0 }
9	filtered_profile	9	filtered_profile
10	end	10	end
11		11