Skip to content

Commit

Permalink
Merge pull request #12 from teachbase/update-rails-version
Browse files Browse the repository at this point in the history
Update rails version
  • Loading branch information
zumkorn authored Apr 5, 2024
2 parents 457f7cb + b2a7df4 commit ea9a4f7
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 8 deletions.
2 changes: 1 addition & 1 deletion clickmeetings.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
spec.add_development_dependency 'simplecov'
spec.add_development_dependency 'simplecov-gem-profile'
spec.add_development_dependency 'webmock', '~> 2'
spec.add_dependency 'activemodel', '>= 4.1', '< 7'
spec.add_dependency 'activemodel', '>= 6.1', '< 8'
spec.add_dependency 'anyway_config', '>= 0.3'
spec.add_dependency 'faraday', '>= 1.0', '< 3'
spec.add_dependency 'faraday_middleware', '>= 1.0'
Expand Down
4 changes: 1 addition & 3 deletions lib/clickmeetings.rb
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,7 @@ def self.with_client(client)
end

class ClientRegistry # :nodoc:
extend ActiveSupport::PerThreadRegistry

attr_accessor :client
thread_mattr_accessor :client
end

require 'clickmeetings/engine' if defined?(Rails)
Expand Down
6 changes: 2 additions & 4 deletions lib/clickmeetings/storage.rb
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
require 'active_support/per_thread_registry'
require "active_support/core_ext/module/attribute_accessors_per_thread"

module Clickmeetings
class Storage
extend ActiveSupport::PerThreadRegistry

attr_accessor :cm_current_conference, :cm_current_locale, :cm_open_current_account,
thread_mattr_accessor :cm_current_conference, :cm_current_locale, :cm_open_current_account,
:cm_private_current_account
end
end

0 comments on commit ea9a4f7

Please sign in to comment.