Skip to content
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.

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

Already on GitHub? Sign in to your account

Upgrade to Rails 8.0.1 #1982

Draft
wants to merge 31 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
c253981
updated solr and backlight gem
alinvetian Nov 7, 2024
fcbbdc7
updated search results page payout
alinvetian Nov 7, 2024
2b1c35d
fixed merge conflicts
alinvetian Nov 7, 2024
fe6c573
fixed specs
alinvetian Nov 7, 2024
b42c81b
updated configs and documentation
alinvetian Nov 11, 2024
8a5a597
updated configs, documentation and tests
alinvetian Nov 11, 2024
59228dc
updated tests
alinvetian Nov 12, 2024
a6664b4
Merge branch 'main' of github.com:datadryad/dryad-app into 3480-upgra…
alinvetian Nov 12, 2024
1cc3ea1
fixed latest resources, code cleanup
alinvetian Nov 13, 2024
cf38951
allow API search by related works
alinvetian Nov 18, 2024
1b1504b
allow API search by related works
alinvetian Nov 18, 2024
452091f
fixed tests, updated documentation
alinvetian Nov 18, 2024
2a69862
updated search, updated discover method
alinvetian Nov 19, 2024
8ea2b2d
Merge branch 'main' of github.com:datadryad/dryad-app into 3480-upgra…
alinvetian Dec 5, 2024
89e05d0
Merge branch 'main' of github.com:datadryad/dryad-app into 3480-upgra…
alinvetian Dec 6, 2024
bfb784d
Merge branch '3480-upgrade-blacklight-and-solr-to-current-versions' o…
alinvetian Dec 9, 2024
8baf949
updated query and configuration
alinvetian Dec 10, 2024
f329a16
fixed rubocop
alinvetian Dec 10, 2024
643a5f3
fixed tests
alinvetian Dec 10, 2024
68a55be
Merge branch 'main' of github.com:datadryad/dryad-app into 3480-upgra…
alinvetian Dec 11, 2024
8a3d174
fixed merge conflicts
alinvetian Dec 11, 2024
29d8226
Merge branch 'main' of github.com:datadryad/dryad-app into 3480-upgra…
alinvetian Jan 14, 2025
75ef3e8
fixed merge conflicts
alinvetian Jan 14, 2025
2854efc
changed environments and started project
alinvetian Jan 16, 2025
d0645a9
fixed merge conflicts
alinvetian Jan 17, 2025
397133f
fixed merge conflicts
alinvetian Jan 17, 2025
4985461
updated github ruby version
alinvetian Jan 17, 2025
f2bc15d
fixed migrations, updated models enum definition
alinvetian Jan 20, 2025
b87b8bf
updated to rails 8
alinvetian Jan 21, 2025
873025a
updates
alinvetian Jan 21, 2025
07da429
updated gems and tests
alinvetian Jan 21, 2025
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
58 changes: 58 additions & 0 deletions .annotaterb.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
---
:position: before
:position_in_additional_file_patterns: before
:position_in_class: before
:position_in_factory: before
:position_in_fixture: before
:position_in_routes: before
:position_in_serializer: before
:position_in_test: before
:classified_sort: true
:exclude_controllers: true
:exclude_factories: false
:exclude_fixtures: false
:exclude_helpers: true
:exclude_scaffolds: true
:exclude_serializers: false
:exclude_sti_subclasses: false
:exclude_tests: false
:force: false
:format_markdown: false
:format_rdoc: false
:format_yard: false
:frozen: false
:ignore_model_sub_dir: false
:ignore_unknown_models: false
:include_version: false
:show_check_constraints: false
:show_complete_foreign_keys: false
:show_foreign_keys: true
:show_indexes: true
:simple_indexes: false
:sort: false
:timestamp: false
:trace: false
:with_comment: true
:with_column_comments: true
:with_table_comments: true
:active_admin: false
:command:
:debug: false
:hide_default_column_types: ''
:hide_limit_column_types: ''
:ignore_columns:
:ignore_routes:
:models: true
:routes: false
:skip_on_db_migrate: false
:target_action: :do_annotations
:wrapper:
:wrapper_close:
:wrapper_open:
:classes_default_to_s: []
:additional_file_patterns: []
:model_dir:
- app/models
:require: []
:root_dir:
- ''
2 changes: 1 addition & 1 deletion .github/workflows/rspec_features.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:

- name: 'Set Ruby and Bundler Versions'
run: |
echo "RUBY_VERSION=3.3.1" >> $GITHUB_ENV
echo "RUBY_VERSION=3.3.7" >> $GITHUB_ENV
echo "BUNDLER_VERSION=`cat ./Gemfile.lock | grep -A 1 'BUNDLED WITH' | grep -oE '[0-9]\.[0-9]'`" >> $GITHUB_ENV
- name: 'Install Ruby and gems'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rspec_internal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:

- name: 'Set Ruby and Bundler Versions'
run: |
echo "RUBY_VERSION=3.3.1" >> $GITHUB_ENV
echo "RUBY_VERSION=3.3.7" >> $GITHUB_ENV
echo "BUNDLER_VERSION=`cat ./Gemfile.lock | grep -A 1 'BUNDLED WITH' | grep -oE '[0-9]\.[0-9]'`" >> $GITHUB_ENV

- name: 'Install Ruby and gems'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rspec_requests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:

- name: 'Set Ruby and Bundler Versions'
run: |
echo "RUBY_VERSION=3.3.1" >> $GITHUB_ENV
echo "RUBY_VERSION=3.3.7" >> $GITHUB_ENV
echo "BUNDLER_VERSION=`cat ./Gemfile.lock | grep -A 1 'BUNDLED WITH' | grep -oE '[0-9]\.[0-9]'`" >> $GITHUB_ENV

- name: 'Install Ruby and gems'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

- name: 'Set Ruby and Bundler Versions'
run: |
echo "RUBY_VERSION=3.3.1" >> $GITHUB_ENV
echo "RUBY_VERSION=3.3.7" >> $GITHUB_ENV
echo "BUNDLER_VERSION=`cat ./Gemfile.lock | grep -A 1 'BUNDLED WITH' | grep -oE '[0-9]\.[0-9]'`" >> $GITHUB_ENV
- name: 'Install Ruby and gems'
Expand Down
40 changes: 21 additions & 19 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
source 'https://rubygems.org'
# do we need this still?
# require File.join(File.dirname(__FILE__), 'lib', 'bundler_help.rb')
ruby '3.3.7'

# ############################################################
# Rails

gem 'irb', '~> 1.4.1'
gem 'irb', '~> 1.14.3'
gem 'mail', '~> 2.8'
gem 'mysql2', '~> 0.5.3'
gem 'rails', '~> 7.0.8.7'
gem 'mysql2', '~> 0.5.6'
gem 'rails', '~> 8.0.1'
gem 'react-rails', '~> 2.6.2'
gem 'shakapacker', '~> 6.0'
gem 'sprockets', '~> 4.0'
Expand All @@ -24,7 +22,7 @@ gem 'ed25519', '1.3.0'
gem 'rdoc', '~> 6.1.1' # for some reason needs to be installed for capistrano to work right
gem 'rubocop', '~> 1.67.0', require: false
# Use Puma as the app server
gem 'puma', '6.4.3', group: :puma, require: false
gem 'puma', '6.5.0', group: :puma, require: false

# ############################################################
# UI
Expand All @@ -46,22 +44,21 @@ gem 'uglifier', '~> 4.2.0'
# Misc

gem 'amatch', '~> 0.4.0'
gem 'amoeba', '~> 3.2.0'
gem 'annotate', '~> 3.2'
gem 'amoeba', '~> 3.3.0'
gem 'aws-sdk-lambda'
gem 'aws-sdk-s3', '~> 1.113'
gem 'blacklight', '= 7.37.0'
gem 'blacklight', '~> 8.7.0'
gem 'bootsnap', require: false
gem 'bootstrap', '~> 4.6'
gem 'charlock_holmes', '~> 0.7.7'
gem 'concurrent-ruby', '~> 1.1.10'
gem 'charlock_holmes', '~> 0.7.9'
gem 'concurrent-ruby', '~> 1.3.4'
gem 'daemons', '~> 1.4.1'
gem 'database_cleaner', '~> 2.0.1'
gem 'datacite-mapping', git: 'https://github.com/CDLUC3/datacite-mapping.git'
gem 'data_migrate'
gem 'delayed_job_active_record', '~> 4.1.7'
gem 'devise', '~> 4.8.0' # I don't believe we are using it directly
gem 'devise-guests', '~> 0.6' # I don't believe we're using it directly
# gem 'devise', '~> 4.8.0' # I don't believe we are using it directly
# gem 'devise-guests', '~> 0.6' # I don't believe we're using it directly
gem 'doorkeeper', '~> 5.5'
gem 'down' # I'm not sure where this is used, but maybe in the frictionless data that Cassiano worked on to dl files
gem 'exception_notification'
Expand All @@ -79,7 +76,7 @@ gem 'jquery-ui-rails', '~> 7.0', git: 'https://github.com/jquery-ui-rails/jquery
gem 'jwt', '~> 2.3.0'
gem 'kaminari', '~> 1.2.2'
gem 'leaflet-rails', '~> 1.7.0'
gem 'loofah', '~> 2.19.1'
gem 'loofah', '~> 2.24.0'
gem 'markdiff', '~> 0.8.1'
gem 'net-ftp', '~> 0.3.4'
gem 'net-sftp'
Expand All @@ -103,7 +100,7 @@ gem 'rinku', '~> 2.0.6' # we used this one, creates links from text but not sure
gem 'rsolr', '~> 2.6.0'
gem 'rubyzip', '~> 2.3', '>= 2.3.2'
gem 'serrano', '~> 1.0' # this is a gem from datacite(?) and not sure it's actively used
gem 'solr_wrapper', '~> 3.1.3' # was once used in tests, not sure still used
# gem 'solr_wrapper', '~> 3.1.3' # was once used in tests, not sure still used
gem 'stripe', '~> 5.50.0'
gem 'sync', '~> 0.5.0' # not sure where this is used
gem 'tins', '~> 1.31.0' # ?? some library that doesn't say what it does aside from stuff that is tiny
Expand Down Expand Up @@ -167,7 +164,7 @@ group :test do
gem 'webmock'
end

group :development, :v3_development, :local_dev, :local, :test do
group :development, :test, :dev do
gem 'binding_of_caller'
# Ruby fast debugger - base + CLI (http://github.com/deivid-rodriguez/byebug)
gem 'byebug'
Expand All @@ -179,13 +176,18 @@ group :development, :v3_development, :local_dev, :local, :test do
# Rails application preloader (https://github.com/rails/spring), says not to install in production
gem 'spring'
# rspec command for spring (https://github.com/jonleighton/spring-commands-rspec)
gem 'bullet'
gem 'letter_opener'
gem 'letter_opener_web', '~> 3.0'
gem 'spring-commands-rspec'
end

group :development, :v3_development, :local_dev do
group :development, :dev do
gem 'colorize'
gem 'rack-mini-profiler'
gem 'web-console'
end

group :development do
gem 'annotaterb', '~> 4.13.0'
gem 'bullet'
end
Loading
Loading