From f34d0a82a1c8b56265627b3814eb9757a444b51f Mon Sep 17 00:00:00 2001 From: Brianna Dardin Date: Sun, 5 Jan 2025 21:02:57 -0800 Subject: [PATCH] Changed ffi to previous version --- Gemfile | 2 +- Gemfile.lock | 4 ++-- app/models/chapter.rb | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 44064dd..8d3c829 100644 --- a/Gemfile +++ b/Gemfile @@ -32,7 +32,7 @@ gem 'redis', '~> 4.6' gem 'bcrypt', '~> 3.1.17' # Adding because version 1.17 throws an unsupported rubygems error -gem "ffi", "< 1.17.0" +gem "ffi", '~> 1.15.5' group :development do # Use Puma as the app server diff --git a/Gemfile.lock b/Gemfile.lock index 31100b3..61936e7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -124,7 +124,7 @@ GEM faraday-retry (1.0.3) faraday_middleware (1.2.0) faraday (~> 1.0) - ffi (1.16.3) + ffi (1.15.5) get_process_mem (0.2.7) ffi (~> 1.0) globalid (1.0.0) @@ -332,7 +332,7 @@ DEPENDENCIES factory_bot_rails faraday (= 1.10.2) faraday_middleware (= 1.2.0) - ffi (< 1.17.0) + ffi (~> 1.15.5) mysql2 (= 0.5.3) net-imap (= 0.3.1) puma (~> 5.6) diff --git a/app/models/chapter.rb b/app/models/chapter.rb index cd715b5..4cc24b5 100644 --- a/app/models/chapter.rb +++ b/app/models/chapter.rb @@ -2,4 +2,6 @@ class Chapter < ApplicationRecord audited comment_required: true belongs_to :story + + self.primary_key = "id" end