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 Rails, Ruby, bootstrap and fix some issues #4

Merged
merged 43 commits into from
Feb 20, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
5203ffb
upgrade to Rails 6.1
fosterfarrell9 Jan 30, 2025
2b40c99
Run rails app:update
fosterfarrell9 Jan 30, 2025
6e84850
Use 6.1 defaults and add token
fosterfarrell9 Jan 30, 2025
6ea90b9
Remove old config files
fosterfarrell9 Jan 30, 2025
52915bc
Remove capybara gem
fosterfarrell9 Jan 30, 2025
bd5d99f
Upgrade to Rails 7.0
fosterfarrell9 Jan 30, 2025
985c386
Update and remove some gems
fosterfarrell9 Jan 30, 2025
dc9bb16
Upgrade to Ruby 3.0.7
fosterfarrell9 Jan 30, 2025
9abe816
Bump sqlite3 gem down
fosterfarrell9 Jan 30, 2025
16df200
Allow Web Console access for localhost
fosterfarrell9 Jan 30, 2025
10296c6
Compile picosat from scratch using proof trace option
fosterfarrell9 Feb 1, 2025
1ae4774
Migrate to Ruby 3.1.6
fosterfarrell9 Feb 1, 2025
3ad5714
Update to Rails 7.1
fosterfarrell9 Feb 1, 2025
b3ad357
Upgrade to Ruby 3.2
fosterfarrell9 Feb 1, 2025
f97c401
Upgrade to Ruby 3.3.7
fosterfarrell9 Feb 1, 2025
756f740
Upgrade to Rails 7.2
fosterfarrell9 Feb 1, 2025
fd8be03
Correct Ruby version in Dockerfile
fosterfarrell9 Feb 1, 2025
eeb2023
Update node.js
fosterfarrell9 Feb 1, 2025
c1c69ac
Remove picosat gem
fosterfarrell9 Feb 2, 2025
ceafe6f
Put example user creation into development seed file
fosterfarrell9 Feb 2, 2025
38513a5
Add Redis and fix cache population
fosterfarrell9 Feb 2, 2025
6620edf
Remove unncecessary rquire
fosterfarrell9 Feb 2, 2025
dc0c44b
Use different redis database in order to avoid clash with mampf
fosterfarrell9 Feb 2, 2025
be14302
Mount local directory
fosterfarrell9 Feb 3, 2025
d15c8f3
Adapt Dockerfile to WSL setting
fosterfarrell9 Feb 3, 2025
c2d654f
Update bootstrap gem to v5
fosterfarrell9 Feb 3, 2025
e163a58
Migrate to bootstrap 5
fosterfarrell9 Feb 3, 2025
0af462a
Migrate to postgresql in development
fosterfarrell9 Feb 4, 2025
ecc6ae6
Change path to picosat tar
fosterfarrell9 Feb 4, 2025
84f6a03
Add Dockerfile for production
fosterfarrell9 Feb 4, 2025
c26366c
Add docker-compose file for production
fosterfarrell9 Feb 4, 2025
c137089
Change path to picosat tar
fosterfarrell9 Feb 4, 2025
9349a73
Remove sqlite3 dependency
fosterfarrell9 Feb 4, 2025
127ff8e
Distinct container name for db
fosterfarrell9 Feb 4, 2025
7c82d35
Use distinct container name for redis
fosterfarrell9 Feb 4, 2025
a2ec845
Update README
fosterfarrell9 Feb 11, 2025
c8d3b16
Reformulate README
fosterfarrell9 Feb 11, 2025
4d6fea4
Update README
fosterfarrell9 Feb 16, 2025
dcbbeee
Replace reference to action_cable.js by actioncable.js
fosterfarrell9 Feb 16, 2025
2d577fa
Remove postgres client from production Dockerfile
fosterfarrell9 Feb 16, 2025
1f0a3ce
Fix grammar
fosterfarrell9 Feb 16, 2025
0b732be
Remove obsolete stuff from Dockerfile
fosterfarrell9 Feb 20, 2025
1c4ecf7
Add comment to Dockerfile
fosterfarrell9 Feb 20, 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
9 changes: 6 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,16 @@ capybara-*.html
.rspec
/log
/tmp
/db/*.sqlite3
/db/*.sqlite3-journal
/public/system
/coverage/
/spec/tmp
**.orig
rerun.txt
pickle-email-*.html

/public/tmp/*
/public/assets/*
/public/packs/*
!/public/assets/.keep
# dotenv
.env

Expand Down Expand Up @@ -40,3 +41,5 @@ bower.json
GPATH
GRTAGS
GTAGS

completed_initial_run
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.0
3.3.7
22 changes: 0 additions & 22 deletions Dockerfile

This file was deleted.

25 changes: 6 additions & 19 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,13 @@ git_source(:github) do |repo_name|
end

gem 'activemodel-serializers-xml'
# gem 'bulma-rails', '~> 0.4.0'
gem 'coveralls', require: false
gem 'globalize'
gem 'globalize-accessors'
gem 'rails-i18n'
gem 'sqlite3'
gem 'bootstrap'
gem 'pg'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 6.0.2.1'
gem 'rails', '7.2.2.1'
# Use Puma as the app server
gem 'puma'
# Use SCSS for stylesheets
Expand All @@ -26,38 +22,29 @@ gem 'uglifier'
# Use CoffeeScript for .coffee assets and views
gem 'coffee-rails'
# See https://github.com/rails/execjs#readme for more supported runtimes
# gem 'therubyracer', platforms: :ruby

# Use jquery as the JavaScript library
gem 'jquery-rails'
# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
gem 'turbolinks'
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem 'jbuilder'
gem 'ricosat'
# Use Redis adapter to run Action Cable in production
# gem 'redis', '~> 3.0'
# Use ActiveModel has_secure_password
# gem 'bcrypt', '~> 3.1.7'

# Use Capistrano for deployment
# gem 'capistrano-rails', group: :development

# Reduces boot times through caching; required in config/boot.rb
gem 'bootsnap', '>= 1.4.2', require: false
gem 'bootsnap', '>= 1.12.6', require: false
gem 'trix-rails', require: 'trix'
gem 'sidekiq'
gem 'sidekiq-status'
gem 'fast_jsonapi'
gem 'devise'
gem 'devise', '>= 4.8.1'
gem 'devise-i18n'
gem 'devise-bootstrap-views', '~> 1.0'
gem 'mimemagic', '~> 0.3.10'
gem 'concurrent-ruby', '1.3.4'

group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'byebug', platform: :mri
gem 'capybara'
gem 'factory_bot_rails'
gem 'faker'
gem 'rake'
Expand All @@ -66,10 +53,10 @@ end

group :development do
# Access an IRB console on exception pages or by using <%= console %> anywhere in the code.
gem 'bullet'
# gem 'bullet'
gem 'listen', '~> 3.0.5'
gem 'web-console', '>= 3.3.0'
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring'
gem 'spring-watcher-listen', '~> 2.0.0'
gem 'spring-watcher-listen'
end
Loading