From a10d3918b712eb50c956275187a515c0e99aa189 Mon Sep 17 00:00:00 2001 From: Brian Hall Date: Thu, 28 Feb 2019 10:17:39 -0500 Subject: [PATCH 1/3] Update CanCanCan dependency to allow v2+ --- canard.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/canard.gemspec b/canard.gemspec index 2e7eeaf..080147c 100644 --- a/canard.gemspec +++ b/canard.gemspec @@ -24,6 +24,6 @@ Gem::Specification.new do |s| s.add_development_dependency 'mongoid', '~> 3.0' s.requirements << "cancan's community supported Rails4+ compatible cancancan fork." - s.add_runtime_dependency 'cancancan', '~> 1' + s.add_runtime_dependency 'cancancan', '>= 1' s.add_runtime_dependency 'role_model', '~> 0' end From ea6fe2bcb342681949799074f5850c8b117ed48c Mon Sep 17 00:00:00 2001 From: Brian Hall Date: Thu, 28 Feb 2019 13:32:00 -0500 Subject: [PATCH 2/3] Update sqlite3 dependency to match Rails version --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 128c3a3..35c68a6 100644 --- a/Gemfile +++ b/Gemfile @@ -13,7 +13,7 @@ group :development, :test do gem 'bson', "~> 1.6.4" platform :ruby, :mswin, :mingw do - gem "sqlite3" + gem "sqlite3", "~> 1.3.5" gem "bson_ext", "~> 1.6.4" end From 8d142e66a4ab1faa3b53ebf7800695c49b0dcd80 Mon Sep 17 00:00:00 2001 From: Brian Hall Date: Thu, 28 Feb 2019 13:45:37 -0500 Subject: [PATCH 3/3] use cancancan 2.3+ --- canard.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/canard.gemspec b/canard.gemspec index 080147c..3c50eef 100644 --- a/canard.gemspec +++ b/canard.gemspec @@ -24,6 +24,6 @@ Gem::Specification.new do |s| s.add_development_dependency 'mongoid', '~> 3.0' s.requirements << "cancan's community supported Rails4+ compatible cancancan fork." - s.add_runtime_dependency 'cancancan', '>= 1' + s.add_runtime_dependency 'cancancan', '~> 2.3' s.add_runtime_dependency 'role_model', '~> 0' end