From 2212dc4aaa6de729d2fe3e39b134b566935b11b7 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <mjankowski@thoughtbot.com>
Date: Thu, 1 Jun 2017 14:53:37 -0400
Subject: Update Rails to version 5.1.1 (#3121)

* Update rails to version 5.1.1

* Run `rails app:update`

* Remove the override of polymorphic activity relationship

* Silence warning about otp_secret attribute being unknown to rails

* We will only introduce form_with where we want to use remote data
---
 app/models/user.rb | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'app/models/user.rb')

diff --git a/app/models/user.rb b/app/models/user.rb
index 8840de82d..c0600fe75 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -58,6 +58,11 @@ class User < ApplicationRecord
 
   before_validation :sanitize_languages
 
+  # This avoids a deprecation warning from Rails 5.1
+  # It seems possible that a future release of devise-two-factor will
+  # handle this itself, and this can be removed from our User class.
+  attribute :otp_secret
+
   def confirmed?
     confirmed_at.present?
   end
-- 
cgit