Merge branch 'master' into proposal-dashboard

2019-04-23 17:12:47 +02:00
parent 94b8caffca b230cd29ab
commit cb22e6cbfb
643 changed files with 2814 additions and 1417 deletions
--- a/app/models/proposal.rb
+++ b/app/models/proposal.rb
@@ -1,4 +1,4 @@
-class Proposal < ActiveRecord::Base
+class Proposal < ApplicationRecord
  include Rails.application.routes.url_helpers
  include Flaggable
  include Taggable