Merge branch 'master' into polls

db/dev_seeds.rb

@@ -36,7 +36,8 @@ Setting.create(key: 'per_page_code', value: "")
 Setting.create(key: 'comments_body_max_length', value: '1000')
 Setting.create(key: 'mailer_from_name', value: 'Consul')
 Setting.create(key: 'mailer_from_address', value: 'noreply@consul.dev')
-
+Setting.create(key: 'meta_description', value: 'Citizen Participation and Open Government Application')
+Setting.create(key: 'meta_keywords', value: 'citizen participation, open government')
 
 puts "Creating Geozones"
 

db/migrate/20161229110336_remove_physical_votes_from_proposals.rb

@@ -0,0 +1,5 @@
+class RemovePhysicalVotesFromProposals < ActiveRecord::Migration
+  def change
+    remove_column :proposals, :physical_votes
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20161227140109) do
+ActiveRecord::Schema.define(version: 20161229110336) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -378,7 +378,6 @@ ActiveRecord::Schema.define(version: 20161227140109) do
     t.string   "responsible_name",    limit: 60
     t.text     "summary"
     t.string   "video_url"
-    t.integer  "physical_votes",                 default: 0
     t.tsvector "tsv"
     t.integer  "geozone_id"
     t.datetime "retired_at"

db/seeds.rb

@@ -57,6 +57,10 @@ Setting["org_name"] = "Consul"
 # Consul installation place name (City, Country...)
 Setting["place_name"] = "Consul-land"
 
+# Meta tags for SEO
+Setting["meta_description"] = nil
+Setting["meta_keywords"] = nil
+
 # Feature flags
 Setting['feature.debates'] = true
 Setting['feature.spending_proposals'] = true