Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ gemspec
# your gem to rubygems.org.

# Shift Commerce gem
gem "flex_commerce_api", git: "https://github.com/flex-commerce/flex-ruby-gem.git", branch: "feature/matalan"
gem "flex_commerce_api", git: "https://github.com/flex-commerce/flex-ruby-gem.git", branch: "upgrade_json_api_client"

group :development, :test do
# Debugging tools
Expand Down
176 changes: 86 additions & 90 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,99 +1,99 @@
GIT
remote: https://github.com/flex-commerce/flex-ruby-gem.git
revision: f1c15f1dd5454cce1861906e94d41c5dc1191ab3
branch: feature/matalan
revision: e665297b2578854b78f8b262b0f36cc7966a190f
branch: upgrade_json_api_client
specs:
flex_commerce_api (0.6.57)
flex_commerce_api (0.8.4.4)
activesupport (>= 4.0)
faraday-http-cache (= 1.3.0)
json_api_client (= 1.1.1)
json_api_client (= 1.6.0)
oj (~> 2.12)
rack (>= 1.6)

PATH
remote: .
specs:
shiftcommerce-rails (0.6.19)
shiftcommerce-rails (0.6.20)
activemerchant (~> 1.54)
meta-tags (~> 2.4)
rack-timeout (~> 0.5.1)
rails (~> 6.0)
rails (>= 5)

GEM
remote: https://rubygems.org/
specs:
actioncable (6.1.3)
actionpack (= 6.1.3)
activesupport (= 6.1.3)
actioncable (6.1.3.2)
actionpack (= 6.1.3.2)
activesupport (= 6.1.3.2)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (6.1.3)
actionpack (= 6.1.3)
activejob (= 6.1.3)
activerecord (= 6.1.3)
activestorage (= 6.1.3)
activesupport (= 6.1.3)
actionmailbox (6.1.3.2)
actionpack (= 6.1.3.2)
activejob (= 6.1.3.2)
activerecord (= 6.1.3.2)
activestorage (= 6.1.3.2)
activesupport (= 6.1.3.2)
mail (>= 2.7.1)
actionmailer (6.1.3)
actionpack (= 6.1.3)
actionview (= 6.1.3)
activejob (= 6.1.3)
activesupport (= 6.1.3)
actionmailer (6.1.3.2)
actionpack (= 6.1.3.2)
actionview (= 6.1.3.2)
activejob (= 6.1.3.2)
activesupport (= 6.1.3.2)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (6.1.3)
actionview (= 6.1.3)
activesupport (= 6.1.3)
actionpack (6.1.3.2)
actionview (= 6.1.3.2)
activesupport (= 6.1.3.2)
rack (~> 2.0, >= 2.0.9)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (6.1.3)
actionpack (= 6.1.3)
activerecord (= 6.1.3)
activestorage (= 6.1.3)
activesupport (= 6.1.3)
actiontext (6.1.3.2)
actionpack (= 6.1.3.2)
activerecord (= 6.1.3.2)
activestorage (= 6.1.3.2)
activesupport (= 6.1.3.2)
nokogiri (>= 1.8.5)
actionview (6.1.3)
activesupport (= 6.1.3)
actionview (6.1.3.2)
activesupport (= 6.1.3.2)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (6.1.3)
activesupport (= 6.1.3)
activejob (6.1.3.2)
activesupport (= 6.1.3.2)
globalid (>= 0.3.6)
activemerchant (1.119.0)
activesupport (>= 4.2)
builder (>= 2.1.2, < 4.0.0)
i18n (>= 0.6.9)
nokogiri (~> 1.4)
activemodel (6.1.3)
activesupport (= 6.1.3)
activerecord (6.1.3)
activemodel (= 6.1.3)
activesupport (= 6.1.3)
activestorage (6.1.3)
actionpack (= 6.1.3)
activejob (= 6.1.3)
activerecord (= 6.1.3)
activesupport (= 6.1.3)
marcel (~> 0.3.1)
mimemagic (~> 0.3.2)
activesupport (6.1.3)
activemodel (6.1.3.2)
activesupport (= 6.1.3.2)
activerecord (6.1.3.2)
activemodel (= 6.1.3.2)
activesupport (= 6.1.3.2)
activestorage (6.1.3.2)
actionpack (= 6.1.3.2)
activejob (= 6.1.3.2)
activerecord (= 6.1.3.2)
activesupport (= 6.1.3.2)
marcel (~> 1.0.0)
mini_mime (~> 1.0.2)
activesupport (6.1.3.2)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
zeitwerk (~> 2.3)
addressable (2.5.1)
public_suffix (~> 2.0, >= 2.0.2)
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
builder (3.2.4)
byebug (9.0.6)
coderay (1.1.1)
byebug (11.1.3)
coderay (1.1.3)
concurrent-ruby (1.1.8)
crack (0.4.3)
safe_yaml (~> 1.0.0)
crack (0.4.5)
rexml
crass (1.0.6)
diff-lcs (1.4.4)
erubi (1.10.0)
Expand All @@ -105,77 +105,75 @@ GEM
faraday (>= 0.7.4, < 1.0)
globalid (0.4.2)
activesupport (>= 4.2.0)
hashdiff (0.3.4)
i18n (1.8.9)
hashdiff (1.0.1)
i18n (1.8.10)
concurrent-ruby (~> 1.0)
json_api_client (1.1.1)
json_api_client (1.6.0)
activemodel (>= 3.2.0)
activesupport (>= 3.2.0)
addressable (~> 2.2)
faraday (~> 0.9)
faraday (~> 0.15, >= 0.15.2)
faraday_middleware (~> 0.9)
loofah (2.9.0)
loofah (2.9.1)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
mini_mime (>= 0.1.1)
marcel (0.3.3)
mimemagic (~> 0.3.2)
marcel (1.0.1)
meta-tags (2.14.0)
actionpack (>= 3.2.0, < 6.2)
method_source (0.8.2)
mimemagic (0.3.5)
mini_mime (1.0.2)
mini_portile2 (2.5.0)
method_source (1.0.0)
mini_mime (1.0.3)
mini_portile2 (2.5.1)
minitest (5.14.4)
multipart-post (2.1.1)
nio4r (2.5.7)
nokogiri (1.11.1)
nokogiri (1.11.4)
mini_portile2 (~> 2.5.0)
racc (~> 1.4)
oj (2.18.5)
pry (0.10.4)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
pry-byebug (3.4.2)
byebug (~> 9.0)
pry (~> 0.10)
pry-rails (0.3.6)
pry (0.13.1)
coderay (~> 1.1)
method_source (~> 1.0)
pry-byebug (3.9.0)
byebug (~> 11.0)
pry (~> 0.13.0)
pry-rails (0.3.9)
pry (>= 0.10.4)
public_suffix (2.0.5)
public_suffix (4.0.6)
racc (1.5.2)
rack (2.2.3)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rack-timeout (0.5.2)
rails (6.1.3)
actioncable (= 6.1.3)
actionmailbox (= 6.1.3)
actionmailer (= 6.1.3)
actionpack (= 6.1.3)
actiontext (= 6.1.3)
actionview (= 6.1.3)
activejob (= 6.1.3)
activemodel (= 6.1.3)
activerecord (= 6.1.3)
activestorage (= 6.1.3)
activesupport (= 6.1.3)
rails (6.1.3.2)
actioncable (= 6.1.3.2)
actionmailbox (= 6.1.3.2)
actionmailer (= 6.1.3.2)
actionpack (= 6.1.3.2)
actiontext (= 6.1.3.2)
actionview (= 6.1.3.2)
activejob (= 6.1.3.2)
activemodel (= 6.1.3.2)
activerecord (= 6.1.3.2)
activestorage (= 6.1.3.2)
activesupport (= 6.1.3.2)
bundler (>= 1.15.0)
railties (= 6.1.3)
railties (= 6.1.3.2)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.3.0)
loofah (~> 2.3)
railties (6.1.3)
actionpack (= 6.1.3)
activesupport (= 6.1.3)
railties (6.1.3.2)
actionpack (= 6.1.3.2)
activesupport (= 6.1.3.2)
method_source
rake (>= 0.8.7)
thor (~> 1.0)
rake (13.0.3)
rexml (3.2.5)
rspec-core (3.9.3)
rspec-support (~> 3.9.3)
rspec-expectations (3.9.4)
Expand All @@ -193,8 +191,6 @@ GEM
rspec-mocks (~> 3.9.0)
rspec-support (~> 3.9.0)
rspec-support (3.9.4)
safe_yaml (1.0.4)
slop (3.6.0)
sprockets (4.0.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
Expand Down
2 changes: 1 addition & 1 deletion lib/shift_commerce/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module ShiftCommerce
VERSION = '0.6.20'
VERSION = '0.6.21'
end
2 changes: 1 addition & 1 deletion shiftcommerce-rails.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Gem::Specification.new do |spec|

spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }

spec.add_dependency "rails", "~> 6.0"
spec.add_dependency "rails", ">= 5"
spec.add_dependency "activemerchant", "~> 1.54"
spec.add_dependency "meta-tags", "~> 2.4"
spec.add_dependency "rack-timeout", "~> 0.5.1"
Expand Down