Skip to content

Commit b715995

Browse files
committed
DACCESS-646 - Upgrade to rails 7
1 parent 8e78f6b commit b715995

File tree

70 files changed

+1224
-1136
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+1224
-1136
lines changed

.gitignore

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
/.bundle
1717

1818
# Ignore the default SQLite database.
19-
/blacklight-cornell/db/*.sqlite3
19+
/blacklight-cornell/db/*.sqlite3*
2020
/db/*.sqlite3
2121

2222
# Ignore all logfiles and tempfiles.
@@ -42,8 +42,6 @@
4242
# ignore coverage tests
4343
/blacklight-cornell/coverage
4444
/coverage
45-
/blacklight-cornell/db/test.sqlite3-journal
46-
/db/test.sqlite3-journal
4745

4846
# ignore tests Jenkins blacklight-cornell-merge-pr deletes
4947
/blacklight-cornell/results/*

blacklight-cornell/Gemfile

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,23 @@
11
source "https://rubygems.org"
22
ruby "3.2.9"
3-
gem "rails", "~> 6.1.7"
3+
gem "rails", "~> 7.2.2"
44

5-
gem "activerecord-session_store", ">= 2.0.0"
5+
gem "activerecord-session_store", ">= 2.2.0"
66
gem "addressable", ">= 2.8.0"
77
gem "appsignal", "~> 3.3.2" #, '2.11.10'
88
gem "aws-sdk-s3", "~> 1.143"
9-
gem "bento_search", "~> 2.0.0.rc1"
10-
gem "blacklight" # , '7.29.0'
11-
gem "blacklight-hierarchy"
12-
gem "blacklight-marc", "~> 6.3"
9+
gem "bento_search", "~> 2.0.0.rc2"
10+
gem "blacklight", "<= 8.0"
11+
gem "blacklight-hierarchy", "~> 6.4.0"
12+
gem "blacklight-marc", "~> 8.2"
1313
gem "blacklight_range_limit", "~> 8.5.0"
1414
gem "blacklight_unapi", :git => "https://github.com/cul-it/blacklight-unapi", :branch => "BL7-upgrade"
1515
gem "bootstrap", "~> 4.6"
1616
gem "capistrano", "~> 3.18"
1717
gem "capistrano-rails", "~> 1.6"
1818
gem 'capistrano-rvm'
19-
gem "celluloid", "0.17.4" # Required for bento_search multisearcher
2019
gem "coffee-rails", "~> 4.0"
21-
gem "concurrent-ruby", "1.2.3", require: "concurrent"
20+
gem "concurrent-ruby", require: "concurrent"
2221
gem 'devise', '>= 4.7.0'
2322
gem 'devise-guests', '~> 0.3'
2423
gem "dotenv-rails", "2.8.1" # NOTE: unpinning this and letting it drift to latest (v3.x) breaks SAML login!
@@ -70,9 +69,9 @@ gem "uri", "0.12.4"
7069
gem "whenever", require: false
7170
gem "yaml_db"
7271

73-
gem "blacklight_cornell_requests", git: "https://github.com/cul-it/blacklight-cornell-requests", tag: "v5.3"
72+
gem "blacklight_cornell_requests", git: "https://github.com/cul-it/blacklight-cornell-requests", branch: "dev"
7473
gem "cul-folio-edge", git: "https://github.com/cul-it/cul-folio-edge", tag: "v3.2"
75-
gem "my_account", git: "https://github.com/cul-it/cul-my-account", tag: "v2.3.8"
74+
# gem "my_account", git: "https://github.com/cul-it/cul-my-account", tag: "v2.3.8"
7675

7776
group :development, :test do
7877
gem "awesome_print"

0 commit comments

Comments
 (0)