From 40bafef9c7eaf6258b8e789a6f0ddbbf08993297 Mon Sep 17 00:00:00 2001
From: Yuri Sidorov <403994+newstler@users.noreply.github.com>
Date: Fri, 5 May 2023 19:14:42 +0200
Subject: [PATCH] Updated jbuilder-schema

---
 Gemfile                 | 9 +++------
 Gemfile.lock            | 8 ++++----
 test/factories/users.rb | 1 -
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/Gemfile b/Gemfile
index 6ec7e2c42..a677d6b97 100644
--- a/Gemfile
+++ b/Gemfile
@@ -97,12 +97,9 @@ end
 # This section is the list of Ruby gems included by default for Bullet Train.
 
 # Core packages.
-# gem "bullet_train"
-# gem "bullet_train-super_scaffolding"
-# gem "bullet_train-api"
-gem "bullet_train", path: "../bullet_train-core/bullet_train"
-gem "bullet_train-super_scaffolding", path: "../bullet_train-core/bullet_train-super_scaffolding"
-gem "bullet_train-api", path: "../bullet_train-core/bullet_train-api"
+gem "bullet_train"
+gem "bullet_train-super_scaffolding"
+gem "bullet_train-api"
 gem "bullet_train-outgoing_webhooks"
 gem "bullet_train-incoming_webhooks"
 gem "bullet_train-themes"
diff --git a/Gemfile.lock b/Gemfile.lock
index 2a6d6722b..f96b4a4c8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -133,7 +133,7 @@ GEM
       bullet_train
       doorkeeper
       factory_bot
-      jbuilder-schema (>= 2.0.0)
+      jbuilder-schema (>= 2.2.0)
       pagy
       pagy_cursor
       rack-cors
@@ -612,8 +612,8 @@ DEPENDENCIES
   active_hash
   aws-sdk-s3
   bootsnap
-  bullet_train!
-  bullet_train-api!
+  bullet_train
+  bullet_train-api
   bullet_train-incoming_webhooks
   bullet_train-integrations
   bullet_train-integrations-stripe
@@ -621,7 +621,7 @@ DEPENDENCIES
   bullet_train-outgoing_webhooks
   bullet_train-scope_questions
   bullet_train-sortable
-  bullet_train-super_scaffolding!
+  bullet_train-super_scaffolding
   bullet_train-themes
   bullet_train-themes-light
   capybara (~> 3.39)
diff --git a/test/factories/users.rb b/test/factories/users.rb
index 6fc6f8d01..af8fa6304 100644
--- a/test/factories/users.rb
+++ b/test/factories/users.rb
@@ -24,7 +24,6 @@
       factory :user_example do
         first_name { "Example First Name" }
         last_name { "Example Last Name" }
-        locale { "en" }
       end
     end
   end