From 65c86343a8f0fbaa9d462e963a9ffc07e63811dc Mon Sep 17 00:00:00 2001 From: Satoshi Hashimoto <8xx4xx8xx4@gmail.com> Date: Fri, 29 Jul 2016 19:11:15 +0900 Subject: [PATCH 1/2] =?UTF-8?q?devise=E3=81=AE=E3=83=90=E3=83=BC=E3=82=B8?= =?UTF-8?q?=E3=83=A7=E3=83=B3=E3=82=923.0.0=E3=81=AB=E4=B8=8A=E3=81=92?= =?UTF-8?q?=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- spree_auth_devise.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spree_auth_devise.gemspec b/spree_auth_devise.gemspec index 21aaec793..e660f3d03 100644 --- a/spree_auth_devise.gemspec +++ b/spree_auth_devise.gemspec @@ -17,6 +17,6 @@ Gem::Specification.new do |s| s.requirements << 'none' s.add_dependency 'spree_core' - s.add_dependency 'devise', '~> 2.0.4' + s.add_dependency 'devise', '~> 3.0.0' s.add_dependency 'cancan', '= 1.6.7' end From 76885f1f92b3aa81f8d85904dbd5817a2d05db34 Mon Sep 17 00:00:00 2001 From: "J.Fukaya" Date: Wed, 3 Aug 2016 19:28:07 +0900 Subject: [PATCH 2/2] =?UTF-8?q?email=5Fregexp=E3=81=AE=E6=AD=A3=E8=A6=8F?= =?UTF-8?q?=E8=A1=A8=E7=8F=BE=E3=82=92=E6=8E=A8=E5=A5=A8=E3=81=95=E3=82=8C?= =?UTF-8?q?=E3=82=8B=E6=9B=B8=E3=81=8D=E6=96=B9=E3=81=AB=E5=A4=89=E6=9B=B4?= =?UTF-8?q?=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 次のエラーに対応するための修正 activemodel-4.0.0/lib/active_model/validations/format.rb:46:in `check_options_validity': The provided regular expression is using multiline anchors (^ or $), which may present a security risk. Did you mean to use \A and \z, or forgot to add the :multiline => true option? (ArgumentError) --- config/initializers/devise.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index b13750484..2b58f5bb2 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -66,7 +66,7 @@ # config.password_length = 6..20 # Regex to use to validate the email address - config.email_regexp = /^([\w\.%\+\-]+)@([\w\-]+\.)+([\w]{2,})$/i + config.email_regexp = /\A([\w\.%\+\-]+)@([\w\-]+\.)+([\w]{2,})\z/i # ==> Configuration for :timeoutable # The time you want to timeout the user session without activity. After this