From d43f87208945ddfe0f9d5fdc90215a2148fb3bc8 Mon Sep 17 00:00:00 2001 From: Kyle Date: Sat, 11 Nov 2017 22:08:22 -0800 Subject: [PATCH 1/7] Update Gemfile --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index ea8d6e4..5103ce1 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'spree', github: 'spree/spree', branch: '3-2-stable' +gem 'spree', github: 'spree/spree', '~> 3.4.0' # Spree Internationalization https://github.com/spree/spree_i18n gem 'spree_i18n', github: 'spree/spree_i18n', branch: 'master' From e496f7bb44f7058c2174c3e7445be23da55c29d7 Mon Sep 17 00:00:00 2001 From: Kyle Date: Sat, 11 Nov 2017 22:08:45 -0800 Subject: [PATCH 2/7] Update 20130709104101_create_spree_permissions.rb --- db/migrate/20130709104101_create_spree_permissions.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/migrate/20130709104101_create_spree_permissions.rb b/db/migrate/20130709104101_create_spree_permissions.rb index ffacd9d..d6d4cc2 100644 --- a/db/migrate/20130709104101_create_spree_permissions.rb +++ b/db/migrate/20130709104101_create_spree_permissions.rb @@ -1,4 +1,4 @@ -class CreateSpreePermissions < ActiveRecord::Migration +class CreateSpreePermissions < ActiveRecord::Migration[5.1] def change create_table :spree_permissions do |t| t.string :title, null: false, unique: true From da05de7caee5622ea16998c9555afc5aec04fcd2 Mon Sep 17 00:00:00 2001 From: Kyle Date: Sat, 11 Nov 2017 22:09:01 -0800 Subject: [PATCH 3/7] Update 20130709104945_create_spree_roles_permissions.rb --- db/migrate/20130709104945_create_spree_roles_permissions.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/migrate/20130709104945_create_spree_roles_permissions.rb b/db/migrate/20130709104945_create_spree_roles_permissions.rb index 5d3475f..8e6a3f6 100644 --- a/db/migrate/20130709104945_create_spree_roles_permissions.rb +++ b/db/migrate/20130709104945_create_spree_roles_permissions.rb @@ -1,4 +1,4 @@ -class CreateSpreeRolesPermissions < ActiveRecord::Migration +class CreateSpreeRolesPermissions < ActiveRecord::Migration[5.1] def change create_table :spree_roles_permissions, id: false do |t| t.integer :role_id, null: false From 77c6fdf13b15d0428dcc825d2e1b074a8adc5b7c Mon Sep 17 00:00:00 2001 From: Kyle Date: Sat, 11 Nov 2017 22:09:12 -0800 Subject: [PATCH 4/7] Update 20130709105614_add_editable_is_default_and_index_on_editable_is_default_and_name_to_spree_roles.rb --- ..._and_index_on_editable_is_default_and_name_to_spree_roles.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/migrate/20130709105614_add_editable_is_default_and_index_on_editable_is_default_and_name_to_spree_roles.rb b/db/migrate/20130709105614_add_editable_is_default_and_index_on_editable_is_default_and_name_to_spree_roles.rb index 04aff85..a528cd6 100644 --- a/db/migrate/20130709105614_add_editable_is_default_and_index_on_editable_is_default_and_name_to_spree_roles.rb +++ b/db/migrate/20130709105614_add_editable_is_default_and_index_on_editable_is_default_and_name_to_spree_roles.rb @@ -1,4 +1,4 @@ -class AddEditableIsDefaultAndIndexOnEditableIsDefaultAndNameToSpreeRoles < ActiveRecord::Migration +class AddEditableIsDefaultAndIndexOnEditableIsDefaultAndNameToSpreeRoles < ActiveRecord::Migration[5.1] def change add_column :spree_roles, :editable, :boolean, default: true add_column :spree_roles, :is_default, :boolean, default: false From 7082f8a246878d6b5f284b6e181bc9b35536e602 Mon Sep 17 00:00:00 2001 From: ktdmedia Date: Sat, 11 Nov 2017 22:13:32 -0800 Subject: [PATCH 5/7] Spree 3.4 --- Gemfile | 2 +- db/migrate/20130709104101_create_spree_permissions.rb | 2 +- db/migrate/20130709104945_create_spree_roles_permissions.rb | 2 +- ..._and_index_on_editable_is_default_and_name_to_spree_roles.rb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 5103ce1..f061f9e 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'spree', github: 'spree/spree', '~> 3.4.0' +gem 'spree', '~> 3.4.0' # Spree Internationalization https://github.com/spree/spree_i18n gem 'spree_i18n', github: 'spree/spree_i18n', branch: 'master' diff --git a/db/migrate/20130709104101_create_spree_permissions.rb b/db/migrate/20130709104101_create_spree_permissions.rb index d6d4cc2..077899a 100644 --- a/db/migrate/20130709104101_create_spree_permissions.rb +++ b/db/migrate/20130709104101_create_spree_permissions.rb @@ -1,4 +1,4 @@ -class CreateSpreePermissions < ActiveRecord::Migration[5.1] +class CreateSpreePermissions < ActiveRecord::Migration[5.0] def change create_table :spree_permissions do |t| t.string :title, null: false, unique: true diff --git a/db/migrate/20130709104945_create_spree_roles_permissions.rb b/db/migrate/20130709104945_create_spree_roles_permissions.rb index 8e6a3f6..eb630eb 100644 --- a/db/migrate/20130709104945_create_spree_roles_permissions.rb +++ b/db/migrate/20130709104945_create_spree_roles_permissions.rb @@ -1,4 +1,4 @@ -class CreateSpreeRolesPermissions < ActiveRecord::Migration[5.1] +class CreateSpreeRolesPermissions < ActiveRecord::Migration[5.0] def change create_table :spree_roles_permissions, id: false do |t| t.integer :role_id, null: false diff --git a/db/migrate/20130709105614_add_editable_is_default_and_index_on_editable_is_default_and_name_to_spree_roles.rb b/db/migrate/20130709105614_add_editable_is_default_and_index_on_editable_is_default_and_name_to_spree_roles.rb index a528cd6..f3995c8 100644 --- a/db/migrate/20130709105614_add_editable_is_default_and_index_on_editable_is_default_and_name_to_spree_roles.rb +++ b/db/migrate/20130709105614_add_editable_is_default_and_index_on_editable_is_default_and_name_to_spree_roles.rb @@ -1,4 +1,4 @@ -class AddEditableIsDefaultAndIndexOnEditableIsDefaultAndNameToSpreeRoles < ActiveRecord::Migration[5.1] +class AddEditableIsDefaultAndIndexOnEditableIsDefaultAndNameToSpreeRoles < ActiveRecord::Migration[5.0] def change add_column :spree_roles, :editable, :boolean, default: true add_column :spree_roles, :is_default, :boolean, default: false From 482e31b54fadb9db6cfb6d8e0acee8d684500de6 Mon Sep 17 00:00:00 2001 From: ktdmedia Date: Sat, 11 Nov 2017 22:14:46 -0800 Subject: [PATCH 6/7] Spree 3.4 --- spree_admin_roles_and_access.gemspec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spree_admin_roles_and_access.gemspec b/spree_admin_roles_and_access.gemspec index 4fe0c77..945b32d 100644 --- a/spree_admin_roles_and_access.gemspec +++ b/spree_admin_roles_and_access.gemspec @@ -2,7 +2,7 @@ Gem::Specification.new do |s| s.platform = Gem::Platform::RUBY s.name = 'spree_admin_roles_and_access' - s.version = '3.2.1.beta' + s.version = '3.4.0' s.summary = 'Dynamically defines roles and grants it permissions' s.required_ruby_version = '>= 2.2.0' s.files = Dir['LICENSE', 'README.md', 'app/**/*', 'config/**/*', 'lib/**/*', 'db/**/*'] @@ -14,8 +14,8 @@ Gem::Specification.new do |s| s.require_path = 'lib' s.requirements << 'none' - s.add_dependency 'spree_core', '~> 3.2.1' - s.add_dependency 'spree_auth_devise', '~> 3.2.0.alpha' + s.add_dependency 'spree_core', '~> 3.4.0' + s.add_dependency 'spree_auth_devise', '~> 3.4.0' s.add_development_dependency 'capybara' s.add_development_dependency 'ffaker' From 600d8d90fee111f8a89fdf293b7a8761ea93dc05 Mon Sep 17 00:00:00 2001 From: ktdmedia Date: Sat, 11 Nov 2017 22:15:33 -0800 Subject: [PATCH 7/7] Spree 3.4.0 --- spree_admin_roles_and_access.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spree_admin_roles_and_access.gemspec b/spree_admin_roles_and_access.gemspec index 945b32d..3fa857b 100644 --- a/spree_admin_roles_and_access.gemspec +++ b/spree_admin_roles_and_access.gemspec @@ -15,7 +15,7 @@ Gem::Specification.new do |s| s.requirements << 'none' s.add_dependency 'spree_core', '~> 3.4.0' - s.add_dependency 'spree_auth_devise', '~> 3.4.0' + s.add_dependency 'spree_auth_devise', '~> 3.3' s.add_development_dependency 'capybara' s.add_development_dependency 'ffaker'