Skip to content

Merge upstream master into the fork #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
njakobsen merged 3 commits into from
Oct 25, 2026
Merged

Merge upstream master into the fork #9

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
31fad40
build: Keep prism below 2 for the `sunspot_rails` suite on Ruby 2.7
njakobsen Oct 24, 2026
4d4beb7
Merge pull request #1060 from culturecode/pin-prism
njakobsen Oct 24, 2026
d04136f
Merge upstream master into the fork
njakobsen Oct 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions sunspot_rails/sunspot_rails.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,11 @@ Gem::Specification.new do |s|
s.add_development_dependency 'psych', '< 4.0'
end

# Ruby 2.7 compatibility: its Bundler picks prism 2's precompiled gems, which need Ruby 3.3
if RUBY_VERSION >= '2.7' && RUBY_VERSION < '3.0'
s.add_development_dependency 'prism', '< 2'
end

s.rdoc_options << '--webcvs=http://github.com/outoftime/sunspot/tree/master/%s' <<
'--title' << 'Sunspot-Rails - Rails integration for the Sunspot Solr search library - API Documentation' <<
'--main' << 'README.rdoc'
Expand Down
Loading