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

Fix deprecations to make Solidus work with Rails 5.2.2 #2992

Merged
merged 3 commits into from
Dec 7, 2018
Merged

Fix deprecations to make Solidus work with Rails 5.2.2 #2992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fa06f44
Fix apply_free_shipping_promotions deprecation
kennyadsl Dec 6, 2018
4060568
Fix Spree::Store#by_url deprecation
kennyadsl Dec 6, 2018
50346d6
Revert "Lock Rails version up to 5.2.1"
kennyadsl Dec 6, 2018
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
1 change: 1 addition & 0 deletions core/app/models/spree/order.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -552,6 +552,7 @@ def apply_shipping_promotions
Spree::PromotionHandler::Shipping.new(self).activate
recalculate
end
alias_method :apply_free_shipping_promotions, :apply_shipping_promotions
deprecate apply_free_shipping_promotions: :apply_shipping_promotions, deprecator: Spree::Deprecation

# Clean shipments and make order back to address state
Expand Down
2 changes: 1 addition & 1 deletion core/app/models/spree/store.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class Store < Spree::Base
scope :by_url, lambda { |url| where("url like ?", "%#{url}%") }

class << self
deprecate :by_url, "Spree::Store.by_url is DEPRECATED", deprecator: Spree::Deprecation
deprecate by_url: "Spree::Store.by_url is DEPRECATED", deprecator: Spree::Deprecation
end

def available_locales
Expand Down
2 changes: 1 addition & 1 deletion core/solidus_core.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Gem::Specification.new do |s|
actionmailer actionpack actionview activejob activemodel activerecord
activesupport railties
].each do |rails_dep|
s.add_dependency rails_dep, ['>= 5.1', '< 5.2.2']
s.add_dependency rails_dep, ['>= 5.1', '< 5.3.x']
end

s.add_dependency 'activemerchant', '~> 1.66'
Expand Down