Merge pull request #3320 from DMPRoadmap/issue3316

Issue 3316

CHANGELOG.md

@@ -1,15 +1,16 @@
 # Changelog
 
-## v4.1.1
+
+## V4.1.1
 
 ### Added
 - Added `MORE_INFO` and `LESS_INFO` JS constants (for the Research Outputs feature)
 ### Fixed
 - Updated the default font on the 'Download page' to be 'Roboto, Arial, Sans-Serif'
 - Fixed an issue with API V0 that was causing a 500 Internal Server error
+- Solved issue where spring was loaded in production mode : ran `bin/spring binstub --all`
 - Updated fontawesome to V6
 
-
 ## v4.1.0
 
 **Note this upgrade is a migration from Ruby v2.7.6 to v3.0.5.** Note that this could have an impact on any customizations you may have made to your fork of this project. Please see https://www.fastruby.io/blog/ruby/upgrades/upgrade-ruby-from-2.7-to-3.0.html for further information on what to check. In particular, please note the changes to the way [Ruby 3 handles keyword arguments](https://www.ruby-lang.org/en/news/2019/12/12/separation-of-positional-and-keyword-arguments-in-ruby-3-0/)

bin/rspec

@@ -5,7 +5,6 @@ begin
 rescue LoadError => e
   raise unless e.message.include?('spring')
 end
-
 #
 # This file was generated by Bundler.
 #

bin/spring

@@ -1,15 +1,12 @@
 #!/usr/bin/env ruby
 
-# This file loads Spring without using Bundler, in order to be fast.
+# This file loads Spring without using loading other gems in the Gemfile, in order to be fast.
 # It gets overwritten when you run the `spring binstub` command.
 
-unless defined?(Spring)
-  require 'rubygems'
+if !defined?(Spring) && [nil, 'development', 'test'].include?(ENV['RAILS_ENV'])
   require 'bundler'
 
-  lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read)
-  spring = lockfile.specs.detect { |spec| spec.name == 'spring' }
-  if spring
+  Bundler.locked_gems.specs.find { |spec| spec.name == 'spring' }&.tap do |spring|
     Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path
     gem 'spring', spring.version
     require 'spring/binstub'