Download as
Browse Code »

Commit 413fc25bf0a9d0a55499d7b4890f118a1167567e

Authored by Braulio Bhavamitra
1 parent cd68aebb
Exists in staging and in 32 other branches all_pending_tasks_api, api-articles-period, api_roles, comments_permissions, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_notification_email, follower_permition, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, profile_api_improvements, user_mention, webfinger_server

Fix support for ruby 2.3

Showing 2 changed files with 3 additions and 1 deletions   Show diff stats
@@ -31,6 +31,7 @@ gem 'whenever', :require => false @@ -31,6 +31,7 @@ gem 'whenever', :require => false
31 gem 'eita-jrails', '~> 0.10.0', require: 'jrails' 31 gem 'eita-jrails', '~> 0.10.0', require: 'jrails'
32 gem 'diffy', '~> 3.0' 32 gem 'diffy', '~> 3.0'
33 gem 'slim' 33 gem 'slim'
  34 +gem 'activerecord-session_store', ('1.0.0.pre' if RUBY_VERSION >= '2.3.0')
34 35
35 # API dependencies 36 # API dependencies
36 gem 'grape', '~> 0.12' 37 gem 'grape', '~> 0.12'
@@ -51,7 +52,6 @@ gem 'protected_attributes' @@ -51,7 +52,6 @@ gem 'protected_attributes'
51 gem 'rails-observers' 52 gem 'rails-observers'
52 gem 'actionpack-page_caching' 53 gem 'actionpack-page_caching'
53 gem 'actionpack-action_caching' 54 gem 'actionpack-action_caching'
54 -gem 'activerecord-session_store'  
55 gem 'activerecord-deprecated_finders', require: 'active_record/deprecated_finders' 55 gem 'activerecord-deprecated_finders', require: 'active_record/deprecated_finders'
56 56
57 group :production do 57 group :production do
app/models/session.rb
  Diff comments   View file @413fc25
1 class Session < ActiveRecord::SessionStore::Session 1 class Session < ActiveRecord::SessionStore::Session
2 2
  3 + attr_accessible :session_id, :data
  4 +
3 # removed and redefined on super class 5 # removed and redefined on super class
4 def self.find_by_session_id session_id 6 def self.find_by_session_id session_id
5 super 7 super