From bd998499b85e954f88bb355bf605b948b4341484 Mon Sep 17 00:00:00 2001 From: Rob Kaufman Date: Mon, 8 Jan 2024 11:58:22 -0800 Subject: [PATCH 1/2] override gems from knapsack with bundler inject --- .gitignore | 1 + Gemfile | 5 +++++ bundler.d/.gitkeep | 0 3 files changed, 6 insertions(+) create mode 100644 bundler.d/.gitkeep diff --git a/.gitignore b/.gitignore index da50063b3..1a2f62b6e 100644 --- a/.gitignore +++ b/.gitignore @@ -55,3 +55,4 @@ public/uploads docker-compose.override.yml *~undo-tree~ .DS_Store +/bundler.d/ diff --git a/Gemfile b/Gemfile index c12f7d100..5a55c6b56 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,10 @@ # frozen_string_literal: true +# for knapsack overrides of gems. See https://github.com/ManageIQ/bundler-inject +# set BUNDLE_BUNDLER_INJECT__GEM_PATH in your knapsack to point at the knapsack override file. +plugin 'bundler-inject' +require File.join(Bundler::Plugin.index.load_paths("bundler-inject")[0], "bundler-inject") rescue nil + # rubocop:disable Layout/LineLength source 'https://rubygems.org' diff --git a/bundler.d/.gitkeep b/bundler.d/.gitkeep new file mode 100644 index 000000000..e69de29bb From 6a29be90c421e9b5f6ee52a79a36e52f9abdc30e Mon Sep 17 00:00:00 2001 From: Jeremy Friesen Date: Fri, 2 Feb 2024 13:21:23 -0500 Subject: [PATCH 2/2] Appeasing Rubocop --- Gemfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 5a55c6b56..78bcb5f34 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,11 @@ # for knapsack overrides of gems. See https://github.com/ManageIQ/bundler-inject # set BUNDLE_BUNDLER_INJECT__GEM_PATH in your knapsack to point at the knapsack override file. plugin 'bundler-inject' -require File.join(Bundler::Plugin.index.load_paths("bundler-inject")[0], "bundler-inject") rescue nil +begin + require File.join(Bundler::Plugin.index.load_paths("bundler-inject")[0], "bundler-inject") +rescue + nil +end # rubocop:disable Layout/LineLength source 'https://rubygems.org'