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

2981 rails 7 active storage #3822

Draft
wants to merge 58 commits into
base: development
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
9c7fb25
Update Gem dependencies to succeed for Rails 7.1 bundle update.
mjy Feb 12, 2024
628c20a
Merge branch 'development' into 2981_rails_7
mjy Feb 12, 2024
199fdef
Update Gemfile.lock
mjy Feb 12, 2024
5fd055a
Allow 7.1.3
mjy Feb 12, 2024
3757c6c
Update psych gem
mjy Feb 12, 2024
9d3ce91
Update rspec-rails gem to ~> 6.1
mjy Feb 12, 2024
3f57d6b
Update bundler and add CSV gem
mjy Feb 12, 2024
a7233e3
Use validates_timeliness-7.0.0.beta2
mjy Feb 12, 2024
74afd24
Disable deprecation silencing
mjy Feb 12, 2024
d0505e6
Update amazing_print and rainbow gems
mjy Feb 12, 2024
86f2d1e
Bump paperclip gem
mjy Feb 12, 2024
6c5bd51
Stub all 7.1 settings for testing
mjy Feb 12, 2024
6de393a
In which we learn about belongs_to optional: true
mjy Feb 12, 2024
a2cfb5b
Use native production check
mjy Feb 12, 2024
1d5dc25
Move to kt-paperclip as a temporary step to ActiveStorage
mjy Feb 12, 2024
575914f
Use updated deprecator silence
mjy Feb 12, 2024
a41a990
rails active_stoarge:install migration
mjy Feb 12, 2024
6b735e0
Fixed zeitwerk compliance spec failure
LocoDelAssembly Feb 12, 2024
38fc1e2
Several DwC-A importer compatibility fixes
LocoDelAssembly Feb 12, 2024
b55190c
Update sprockets gem to latest
mjy Feb 13, 2024
8e9481c
Merge branch 'development' into 2981_rails_7
LocoDelAssembly Feb 13, 2024
11b66c8
rake secret -> rails secret
LocoDelAssembly Feb 13, 2024
ade9281
Replace deprecated methods
mjy Feb 13, 2024
7e5ccca
Remove @ from taxon name specs
mjy Feb 13, 2024
952b8a1
Postgis extension no created by default anymore.
LocoDelAssembly Feb 13, 2024
e6107a6
Undo postgis_topology inclusion
LocoDelAssembly Feb 13, 2024
08b45b2
Replaced uglifier with terser
LocoDelAssembly Feb 13, 2024
c7f6da1
Handle freeze in cached role update.
mjy Feb 13, 2024
07495ff
Update Citation expectation.
mjy Feb 13, 2024
0d20589
build_<object> is not saved on has_one when parent saved
mjy Feb 13, 2024
c3f13ca
Replaced paperclip-meta with custom repo for kt-paperclip compatibility
LocoDelAssembly Feb 13, 2024
50e432d
Use new "with()" to fix query join
mjy Feb 13, 2024
89eb0a3
Merge branch '2981_rails_7' of github.com:SpeciesFileGroup/taxonworks…
mjy Feb 13, 2024
95d5345
Update invalid params
mjy Feb 14, 2024
cb18708
Better after create behaviour updates the in-memory objects now
mjy Feb 14, 2024
7a4c1ba
Remove redundant :create_otu
mjy Feb 15, 2024
b40e395
Update TaxonName cluster validations
mjy Feb 15, 2024
b6df7d7
Merge branch 'development' into 2981_rails_7
mjy Feb 16, 2024
c2ba1e2
Clean rspec app/models -t group:nomenclature
mjy Feb 16, 2024
725ffe7
Replace destroyed? check on TNR impacting cached values.
mjy Feb 16, 2024
a88084a
Return after_destroy with conditions to TaxonNameRelationship
mjy Feb 16, 2024
ba4198e
Bundle update
mjy Feb 16, 2024
0696388
Update zaru gem (filename sanitation)
mjy Feb 16, 2024
cf348b0
Update shortener gem
mjy Feb 16, 2024
e5f6694
faker and brakeman gem updates
mjy Feb 16, 2024
fb0a690
sdoc and net-smtp gem update
mjy Feb 16, 2024
6c95a03
Update CSL and related libraries
mjy Feb 16, 2024
c30b7d7
Merge branch 'development' into 2981_rails_7
LocoDelAssembly Feb 16, 2024
34ed505
Update chartkick and groupdate gems
mjy Feb 16, 2024
e509a2d
Merge branch '2981_rails_7' of github.com:SpeciesFileGroup/taxonworks…
mjy Feb 16, 2024
67e853c
Revert to use deprecate method
mjy Feb 16, 2024
fe2ddb5
Refactor to remove deprecated annotated_object
mjy Feb 17, 2024
4b75271
Merge branch 'development' into 2981_rails_7
mjy Feb 25, 2024
d9ae8f2
Bundle update
mjy Feb 25, 2024
db77c54
Merge branch 'development' into 2981_rails_7
LocoDelAssembly Mar 6, 2024
2359d2a
Merge branch 'development' into 2981_rails_7
mjy Apr 4, 2024
941cf5b
Bundle update
mjy Apr 4, 2024
eb89536
Merge branch '2981_rails_7' into 2981_rails_7_active_storage
mjy Apr 4, 2024
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
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ FROM base AS assets-precompiler
# http://blog.zeit.io/use-a-fake-db-adapter-to-play-nice-with-rails-assets-precompilation/
RUN bundle add activerecord-nulldb-adapter
RUN printf "production:\n adapter: nulldb" > config/database.yml \
&& printf "production:\n secret_key_base: $(bundle exec rake secret)" > config/secrets.yml
&& printf "production:\n secret_key_base: $(bundle exec rails secret)" > config/secrets.yml

# Precompiling and also removing config files just in case someone uses `docker build --target=assets-precompiler`

Expand Down
62 changes: 37 additions & 25 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ gem 'rack-cors', '~> 2.0', require: 'rack/cors'

ruby '>= 3.2', '< 3.4.0'

gem 'bundler', '~> 2.0'
gem 'bundler', '~> 2.5'

gem 'rake', '~> 13.0'
gem 'rails', '~> 6.1'
gem 'rails', '~> 7.1'
gem 'pg', '~> 1.1'
gem 'activerecord-postgis-adapter', '~> 7.0'
gem 'activerecord-postgis-adapter', '~> 9.0'
gem 'hiredis', '~> 0.6.1'
gem 'redis', '~> 4.5'

Expand All @@ -22,12 +22,15 @@ gem 'rubyzip', '~> 2.3.0'
gem 'zip_tricks', '~> 5.6'
gem 'daemons', '~> 1.4.1'
gem 'tzinfo-data', '~> 1.2019' # , '>= 1.2019.3'
gem 'psych', '~> 3.3'
gem 'psych', '~> 5.1'
gem 'rmagick', '~> 5.1' # , '>= 4.2.2'
gem 'roo', '~> 2.8', '>= 2.8.3'
gem 'roo-xls', '~> 1.2'

gem 'net-smtp', '~> 0.3.1'
gem 'csv', '~> 3.2'


gem 'net-smtp', '~> 0.4'
gem 'mail', '~> 2.8', '>= 2.8.1'
gem 'matrix', '~> 0.4.2'

Expand Down Expand Up @@ -66,21 +69,30 @@ gem 'delayed_job_active_record', '~> 4.1.3'
# TODO: updating to 5.0 causes "NoMethodError: undefined method `has_attached_file' for Image:Class"
# This is likely not the real propegated error, see similar https://github.com/Shopify/bootsnap/issues/218
# version 6 beta out now
gem 'validates_timeliness', '~> 4.1', '>= 4.1.1'
gem 'paper_trail', '~> 12.0'

gem 'validates_timeliness', '~> 7.0.0.beta2' # , '>= 4.1.1'



gem 'paper_trail', '~> 15.0'

gem 'acts_as_list', '~> 1.0'
gem 'modularity', '~> 3.0.0' # TODO: Used!?
gem 'paperclip', github: 'LocoDelAssembly/paperclip', branch: 'migration-fix' # gem 'paperclip', '~> 6.1.0'
gem 'paperclip-meta', '~> 3.0' # TODO: kt-paperclip can be installed but because of this gem old paperclip is installed as well and deprecation warnings continue

gem 'kt-paperclip', '~> 7.2'

# gem 'paperclip', github: 'LocoDelAssembly/paperclip', branch: 'migration-fix' # gem 'paperclip', '~> 6.1.0'
gem 'paperclip-meta', github: 'LocoDelAssembly/paperclip-meta', branch: 'kt-paperclip'

gem 'voight_kampff', github: 'LocoDelAssembly/Voight-Kampff'
gem 'shortener', '~> 1.0.0'
gem 'shortener', '~> 1.0'
gem 'rails_or', '~> 1.1.8'

# javascript
gem 'sprockets-rails', '~> 3.2.0' # UPDATE TODO
gem 'sprockets', '~> 3.7.2' # TODO: Cannot use '~> 4.0' (app fails to initialize properly)
gem 'sprockets-rails', '~> 3.4.0' # UPDATE TODO
gem 'sprockets', '~> 4.2' # TODO: Cannot use '~> 4.0' (app fails to initialize properly)
gem 'sprockets-es6', '~> 0.9.2', require: 'sprockets/es6'
gem 'uglifier', '~> 4.2'
gem 'terser', '~> 1.2'

gem 'jquery-rails', '~> 4.4'
# gem 'jquery-ui-rails', '~> 6.0.1'
Expand All @@ -92,17 +104,17 @@ gem 'jquery-turbolinks', '~> 2.1'
gem 'shakapacker', '7.2.3'

# BibTeX handling
gem 'csl', '~> 1.6.0'
gem 'csl', '~> 2.0'
gem 'bibtex-ruby', '~> 6.0'
gem 'citeproc-ruby', '~> 1.1.10'
gem 'csl-styles', '~> 1.0.1.8'
gem 'citeproc-ruby', '~> 2.0'
gem 'csl-styles', '~> 2.0.1'
gem 'serrano', github: 'LocoDelAssembly/serrano', branch: 'older_thor' #gem 'serrano', '~> 1.0.0'
# gem 'latex-decode', '~> 0.2.2'
gem 'pdf-reader', '~> 2.2'

# UI/UX
gem 'chartkick', '~> 4.0'
gem 'groupdate', '~> 5.2'
gem 'chartkick', '~> 5.0'
gem 'groupdate', '~> 6.4'
gem 'dropzonejs-rails', '~> 0.8.1'
gem 'kaminari', '~> 1.2.0'
gem 'best_in_place', git: 'https://github.com/mmotherwell/best_in_place'
Expand Down Expand Up @@ -130,16 +142,16 @@ gem 'colrapi', '~>0.1.1'
gem 'gnfinder', '~> 1.0'

# Minor Utils/helpers
gem 'amazing_print', '~> 1.4.0'
gem 'amazing_print', '~> 1.5'
gem 'indefinite_article', '~> 0.2.4'
gem 'rainbow', '~> 3.0.0'
gem 'rainbow', '~> 3.0'
gem 'term-ansicolor', '~> 1.6' # DEPRECATED
gem 'chronic', '~> 0.10.2'
gem 'logical_query_parser'
gem 'logic_tools'
gem 'chunky_png', '~> 1.4.0'
gem 'namecase', '~> 2.0'
gem 'zaru', '~> 0.3.0'
gem 'zaru', '~> 1.0'

# Export
gem 'asciidoctor', '~> 2.0'
Expand All @@ -153,8 +165,8 @@ gem 'parallel', '~> 1.23'
gem 'ruby-progressbar', '~> 1.11'

group :test, :development do
gem 'faker', '~> 2.10'
gem 'rspec-rails', '~> 5.0'
gem 'faker', '~> 3.2'
gem 'rspec-rails', '~> 6.1'
gem 'rspec-activemodel-mocks', '~> 1.1.0'
gem 'byebug', '~> 11.1', {}.merge(ENV['RM_INFO'] ? {require: false} : {})
gem 'factory_bot_rails', '~> 6.2'
Expand All @@ -181,12 +193,12 @@ group :development do
gem 'rubocop-rspec', '~>2.6'
gem 'rubocop-faker', '~> 1.1'
gem 'rubocop-performance', '~> 1.10'
gem 'brakeman', '~> 5.1', '>= 4.6.1', require: false
gem 'brakeman', '~> 6.1', '>= 5.4', require: false
gem 'seedbank', '~> 0.5.0'
end

group :doc do
gem 'sdoc', '~> 2.2.0', require: false
gem 'sdoc', '~> 2.6', require: false
end

group :test do
Expand Down
Loading
Loading