Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update versions #23

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Update versions #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8862d07
Update versions
Ghaithdabash Nov 16, 2019
6c629b9
Update rvm version
Ghaithdabash Nov 16, 2019
5f95e30
Fix bug in before_script
Ghaithdabash Nov 16, 2019
4b83eae
Rename Spree::AppConfiguration
Ghaithdabash Nov 16, 2019
2c58526
Remove TokenizedPermission model
Ghaithdabash Nov 22, 2019
2613023
Remove Tracker
Ghaithdabash Nov 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
language: ruby
rvm:
- 2.0.0
- 2.6.5
before_script:
- "export DISPLAY=:99.0"
- "sh -e /etc/init.d/xvfb start"
- 'bundle exec rake test_app'
services:
- xvfb
script: 'bundle exec rspec spec'
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ group :assets do
gem 'therubyracer'
end

gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: '2-2-stable'
gem 'spree_auth_devise', '~> 4.0'

gemspec
2 changes: 1 addition & 1 deletion Versionfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This file is used to designate compatibilty with different versions of Spree
# Please see http://spreecommerce.com/documentation/extensions.html#versionfile for details


'2.3.x' => { :branch => '2-3-stable' }
'2.2.x' => { :branch => '2-2-stable' }
'2.1.x' => { :branch => '2-1-stable' }
'2.0.x' => { :branch => '2-0-stable' }
Expand Down
5 changes: 1 addition & 4 deletions lib/spree_multi_tenant.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ def self.tenanted_models
Spree::Adjustment,
Spree::Asset,
Spree::Calculator,
Spree::Configuration,
Spree::AppConfiguration,
Spree::Country,
Spree::CreditCard,
Spree::Gateway,
Expand Down Expand Up @@ -42,8 +42,6 @@ def self.tenanted_models
Spree::TaxRate,
Spree::Taxonomy,
Spree::Taxon,
Spree::TokenizedPermission,
Spree::Tracker,
Spree::User,
Spree::Variant,
Spree::ZoneMember,
Expand Down Expand Up @@ -90,4 +88,3 @@ def self.with_tenant(tenant, &block)
end

end

10 changes: 5 additions & 5 deletions spree_multi_tenant.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Gem::Specification.new do |s|
s.version = '0.4.0'
s.summary = 'Adds multi-tenant support to Spree'
s.description = 'Allows completely separate Spree sites to be run from the same installation'
s.required_ruby_version = '>= 1.9.3'
s.required_ruby_version = '>= 2.6.5'

s.author = 'Stefan Senk'
# s.email = 'you@example.com'
Expand All @@ -16,15 +16,15 @@ Gem::Specification.new do |s|
s.require_path = 'lib'
s.requirements << 'none'

s.add_dependency 'spree_core', '~> 2.2.0'
s.add_dependency 'spree_core', '~> 4.0.1'
s.add_dependency 'multitenant'

s.add_development_dependency 'capybara', '~> 2.1'
s.add_development_dependency 'capybara'
s.add_development_dependency 'coffee-rails'
s.add_development_dependency 'database_cleaner'
s.add_development_dependency 'factory_girl', '~> 4.2'
s.add_development_dependency 'factory_bot'
s.add_development_dependency 'ffaker'
s.add_development_dependency 'rspec-rails', '~> 2.13'
s.add_development_dependency 'rspec-rails'
s.add_development_dependency 'sass-rails'
s.add_development_dependency 'selenium-webdriver'
s.add_development_dependency 'simplecov'
Expand Down