Skip to content

Commit

Permalink
rails up to 7.0and ruby to 2.7.2
Browse files Browse the repository at this point in the history
mv lib to app/lib due to upgrade

removing concerns from autoload path

resolve zeitwerk issues

make foodsoft run for dev on rails 7 and ruby 2.7

fix mail file permission bug

fix database_config

fix articles controller test ActiveModell::Error

bump Gemfile.lock
  • Loading branch information
Viehlieb authored and yksflip committed Jan 17, 2023
1 parent d7591d4 commit fb8ccfe
Show file tree
Hide file tree
Showing 53 changed files with 583 additions and 594 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.6.9
2.7.2
3 changes: 2 additions & 1 deletion Dockerfile-dev
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:2.6
FROM ruby:2.7

# Install dependencies
RUN deps='libmagic-dev chromium nodejs' && \
Expand All @@ -19,6 +19,7 @@ ENV PORT=3000 \

WORKDIR /app

RUN gem install bundler
RUN bundle config build.nokogiri "--use-system-libraries"

EXPOSE 3000
Expand Down
16 changes: 10 additions & 6 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
# A sample Gemfile
source "https://rubygems.org"

gem "rails", '~> 5.2'
gem "rails", '~> 7.0'
gem 'mail', '~> 2.7.1' # bug with mail 2.8.0 https://github.com/mikel/mail/issues/1489

gem 'sass-rails'

gem 'sassc-rails'
gem 'less-rails'
gem 'uglifier', '>= 1.0.3'
gem 'uglifier'
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
gem 'therubyracer', platforms: :ruby

Expand Down Expand Up @@ -46,7 +48,8 @@ gem 'whenever', require: false # For defining cronjobs, see config/schedule.rb
gem 'ruby-units'
gem 'attribute_normalizer'
gem 'ice_cube'
gem 'recurring_select'
# At time of development 01-06-2022 mmddyyyy necessary fix for config_helper.rb form builder was not in rubygems so we pull from github, see: https://github.com/gregschmit/recurring_select/pull/152
gem 'recurring_select', git: 'https://github.com/gregschmit/recurring_select'
gem 'roo'
gem 'roo-xls'
gem 'spreadsheet'
Expand All @@ -55,7 +58,6 @@ gem 'gaffe'
gem 'ruby-filemagic'
gem 'mime-types'
gem 'midi-smtp-server'
gem 'hashie', '~> 3.4.6', require: false # https://github.com/westfieldlabs/apivore/issues/114
gem 'rswag-api'
gem 'rswag-ui'

Expand Down Expand Up @@ -84,7 +86,8 @@ group :development do
gem 'binding_of_caller'
# gem "rails-i18n-debug"
# chrome debugging extension https://github.com/dejan/rails_panel
gem 'meta_request'
# TODO: disabled due to https://github.com/rails/rails/issues/40781
# gem 'meta_request'

# Get infos when not using proper eager loading
gem 'bullet'
Expand Down Expand Up @@ -121,4 +124,5 @@ group :test do
gem 'simplecov-lcov', require: false
# api
gem 'rswag-specs'
gem 'hashie', '~> 3.4.6', require: false # https://github.com/westfieldlabs/apivore/issues/114
end
Loading

0 comments on commit fb8ccfe

Please sign in to comment.