Merge branch 'master' into redux-polling

2016-12-27 18:22:06 +01:00
parent 3ad648dd63 48fa7ab919
commit 5ec12e4b5b
235 changed files with 3445 additions and 1099 deletions
--- a/app/controllers/proposals_controller.rb
+++ b/app/controllers/proposals_controller.rb
@@ -38,7 +38,7 @@ class ProposalsController < ApplicationController
  end

  def retire
-    if valid_retired_params? && @proposal.update(retired_params.merge(retired_at: Time.now))
+    if valid_retired_params? && @proposal.update(retired_params.merge(retired_at: Time.current))
      redirect_to proposal_path(@proposal), notice: t('proposals.notice.retired')
    else
      render action: :retire_form