Merge branch 'release/2.1.2' into master

* release/2.1.2:
  Update version to 2.1.2
  Deprecation: Module#parent has been renamed to module_parent (abraham gem)[ENG-1094] (#35)
This commit is contained in:
Michael Deutsch 2020-10-22 13:55:58 -04:00
commit 160ec8e10b
2 changed files with 11 additions and 2 deletions

View File

@ -25,9 +25,18 @@ module AbrahamHelper
end end
def abraham_cookie_prefix def abraham_cookie_prefix
"abraham-#{Rails.application.class.parent.to_s.underscore}-#{current_user.id}-#{controller_name}-#{action_name}" "abraham-#{fetch_application_name.to_s.underscore}-#{current_user.id}-#{controller_name}-#{action_name}"
end end
def fetch_application_name
if Module.method_defined?(:module_parent)
Rails.application.class.module_parent
else
Rails.application.class.parent
end
end
def abraham_domain def abraham_domain
request.host request.host
end end

View File

@ -1,5 +1,5 @@
# frozen_string_literal: true # frozen_string_literal: true
module Abraham module Abraham
VERSION = "2.1.1" VERSION = "2.1.2"
end end