Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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 .ruby-version
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
2.7.8
3.3.8

2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:2.7.8-buster
FROM ruby:3.3.8
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably should pick the version


# Install basic Linux packages
RUN apt-get update -qq && apt-get install -y \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.dev
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:2.3
FROM ruby:3.3.8
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same -- should pick a version.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

choosing bookwork, but not slim since this is dev


USER root

Expand Down
23 changes: 13 additions & 10 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,27 +1,29 @@
source 'https://rubygems.org'

ruby "2.7.8"
ruby "3.3.8"

gem 'rails', '~> 6.1.0.0'
gem "rails", "~> 6.1.7"
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Upgraded to latest in 6.1.x instead of just 6.1.0. Smooths some ruby3+ issues too.


gem 'sprockets-rails', '~> 3.2.2'
gem 'mysql2', '~> 0.5.0'
gem 'bootstrap-sass'
gem 'sass-rails', '~> 6.0.0'
#gem 'sass-rails', '~> 6.0.0'
gem "sassc-rails", ">= 2.1.2"
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sass is always a problem. This was simpler than using dart.


gem 'uglifier'
gem 'coffee-rails'
gem "feature_flipper"

gem 'jquery-rails'
gem 'jbuilder', '~> 2.0'
gem 'sdoc', '~> 0.4.0', group: :doc
#gem 'sdoc', '~> 0.4.0', group: :doc

gem 'devise', '~> 4.7.3'
gem 'neat', '1.7.1'
gem 'bourbon', '~> 4.2.2'
gem 'draper'
gem 'paperclip', '~> 6.0.0'
gem 'aws-sdk-s3', '~> 1.98.0'
gem "kt-paperclip", "~> 6.4", ">= 6.4.1"
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the supported version of paperclip now that thoughtbot no longer maintains.

gem 'aws-sdk-s3'
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unlocking so we get newer versions. We use the simplest command in the gem so odds are good its fine.

gem 'rails_admin','~> 2.2.1'
# gem 'rails_admin', git: 'https://github.com/enmand/rails_admin.git'
# rails_admin 1.1.1 has a transitive dependency on haml (~> 4.0). haml 4.0.7 in
Expand All @@ -41,12 +43,11 @@ gem 'cocoon', '~> 1.2.6'
gem 'font-awesome-rails'
gem 'wicked'
gem 'search_cop', '~> 1.0.6'
gem 'mandrill_mailer', '~> 1.0.1'
gem 'mandrill_mailer'#, '~> 1.0.1'
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unlocking so upgrade works

gem 'jwt', '~> 1.2.1'
gem 'httparty', '~> 0.13.7'
gem 'httparty'
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unlocking so upgrade works

gem 'will_paginate', '~> 3.1.7'
gem 'bootstrap-will_paginate'
gem 'aws-sdk-v1', '~> 1.64.0'
gem 'apipie-rails', '~> 0.5.0'
gem 'rack-cors', :require => 'rack/cors'
gem 'ckeditor', '~> 4.3.0'
Expand All @@ -58,12 +59,14 @@ gem 'inky-rb', require: 'inky'
gem 'premailer-rails'
gem "bcrypt", '3.1.16'

gem "json", ">= 2.6", "< 3" # or simply: gem "json", "~> 2.7"
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Forcing a newer version for Ruby 3.x


group :development, :test do
gem 'better_errors'
gem 'capybara', '~> 3.36'
gem 'dotenv-rails'
gem 'faker'
gem 'factory_bot_rails', '~> 6.0.0'
gem 'factory_bot_rails'
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unlocking so it can upgrade. Test/dev so low risk.

gem 'listen'
gem 'pry-rails'
gem 'rspec-rails'
Expand Down
Loading