From 413fc25bf0a9d0a55499d7b4890f118a1167567e Mon Sep 17 00:00:00 2001 From: Braulio Bhavamitra Date: Thu, 7 Apr 2016 13:34:32 -0300 Subject: [PATCH] Fix support for ruby 2.3 --- Gemfile | 2 +- app/models/session.rb | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 5bf8e64..9a04094 100644 --- a/Gemfile +++ b/Gemfile @@ -31,6 +31,7 @@ gem 'whenever', :require => false gem 'eita-jrails', '~> 0.10.0', require: 'jrails' gem 'diffy', '~> 3.0' gem 'slim' +gem 'activerecord-session_store', ('1.0.0.pre' if RUBY_VERSION >= '2.3.0') # API dependencies gem 'grape', '~> 0.12' @@ -51,7 +52,6 @@ gem 'protected_attributes' gem 'rails-observers' gem 'actionpack-page_caching' gem 'actionpack-action_caching' -gem 'activerecord-session_store' gem 'activerecord-deprecated_finders', require: 'active_record/deprecated_finders' group :production do diff --git a/app/models/session.rb b/app/models/session.rb index 0cf82a5..57fe9dd 100644 --- a/app/models/session.rb +++ b/app/models/session.rb @@ -1,5 +1,7 @@ class Session < ActiveRecord::SessionStore::Session + attr_accessible :session_id, :data + # removed and redefined on super class def self.find_by_session_id session_id super -- libgit2 0.21.2