Update decidim

Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/AjuntamentdeBarcelona/decidim.git
-  revision: 3658ee2321dc4ae4350e704f85de729ef981997f
+  revision: 8cad5ac682b43946c55476e4224f5473e90cfe67
   specs:
     decidim (0.0.5)
       decidim-admin (= 0.0.5)
@@ -302,7 +302,7 @@ GEM
     graphiql-rails (1.4.1)
       rails
     graphql (1.4.4)
-    hashie (3.5.3)
+    hashie (3.5.4)
     high_voltage (3.0.0)
     highline (1.7.8)
     htmlentities (4.3.4)
@@ -411,8 +411,8 @@ GEM
       cliver (~> 0.3.1)
       websocket-driver (>= 0.2.0)
     powerpack (0.1.1)
-    premailer (1.9.2)
-      css_parser (>= 1.4.8)
+    premailer (1.10.0)
+      css_parser (>= 1.4.9)
       htmlentities (>= 4.0.0)
     premailer-rails (1.9.5)
       actionmailer (>= 3, < 6)
@@ -561,7 +561,7 @@ GEM
       unicode-display_width (~> 1.1.1)
     thor (0.19.4)
     thread (0.2.2)
-    thread_safe (0.3.5)
+    thread_safe (0.3.6)
     tilt (2.0.6)
     tins (1.13.2)
     truncato (0.7.9)

db/migrate/20170223093814_create_proposal_reports.decidim_proposals.rb

@@ -0,0 +1,15 @@
+# This migration comes from decidim_proposals (originally 20170215113152)
+class CreateProposalReports < ActiveRecord::Migration[5.0]
+  def change
+    create_table :decidim_proposals_proposal_reports do |t|
+      t.references :decidim_proposal, null: false, index: { name: "decidim_proposals_proposal_result_proposal" }
+      t.references :decidim_user, null: false, index: { name: "decidim_proposals_proposal_result_user" }
+      t.string :reason, null: false
+      t.text :details
+
+      t.timestamps
+    end
+
+    add_index :decidim_proposals_proposal_reports, [:decidim_proposal_id, :decidim_user_id], unique: true, name: "decidim_proposals_proposal_report_proposal_user_unique"
+  end
+end

db/migrate/20170223093815_add_report_count_to_proposals.decidim_proposals.rb

@@ -0,0 +1,6 @@
+# This migration comes from decidim_proposals (originally 20170215131720)
+class AddReportCountToProposals < ActiveRecord::Migration[5.0]
+  def change
+    add_column :decidim_proposals_proposals, :report_count, :integer, default: 0
+  end
+end

db/migrate/20170223093816_add_hidden_at_to_proposals.decidim_proposals.rb

@@ -0,0 +1,6 @@
+# This migration comes from decidim_proposals (originally 20170220152416)
+class AddHiddenAtToProposals < ActiveRecord::Migration[5.0]
+  def change
+    add_column :decidim_proposals_proposals, :hidden_at, :datetime
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170222081907) do
+ActiveRecord::Schema.define(version: 20170223093816) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -282,6 +282,18 @@
     t.index ["decidim_organization_id"], name: "index_decidim_processes_on_decidim_organization_id", using: :btree
   end
 
+  create_table "decidim_proposals_proposal_reports", force: :cascade do |t|
+    t.integer  "decidim_proposal_id", null: false
+    t.integer  "decidim_user_id",     null: false
+    t.string   "reason",              null: false
+    t.text     "details"
+    t.datetime "created_at",          null: false
+    t.datetime "updated_at",          null: false
+    t.index ["decidim_proposal_id", "decidim_user_id"], name: "decidim_proposals_proposal_report_proposal_user_unique", unique: true, using: :btree
+    t.index ["decidim_proposal_id"], name: "decidim_proposals_proposal_result_proposal", using: :btree
+    t.index ["decidim_user_id"], name: "decidim_proposals_proposal_result_user", using: :btree
+  end
+
   create_table "decidim_proposals_proposal_votes", force: :cascade do |t|
     t.integer  "decidim_proposal_id", null: false
     t.integer  "decidim_author_id",   null: false
@@ -306,6 +318,8 @@
     t.string   "state"
     t.datetime "answered_at"
     t.jsonb    "answer"
+    t.integer  "report_count",          default: 0
+    t.datetime "hidden_at"
     t.index ["body"], name: "decidim_proposals_proposal_body_search", using: :btree
     t.index ["created_at"], name: "index_decidim_proposals_proposals_on_created_at", using: :btree
     t.index ["decidim_author_id"], name: "index_decidim_proposals_proposals_on_decidim_author_id", using: :btree