Skip to content

Commit

Permalink
Merge branch 'master' into redesign_2023_remaining_work
Browse files Browse the repository at this point in the history
  • Loading branch information
Tyranja committed Sep 21, 2023
2 parents ceb58d9 + 5bfffe2 commit c565776
Show file tree
Hide file tree
Showing 17 changed files with 225 additions and 241 deletions.
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.7
FROM ruby:3.1.1
RUN apt-get update -qq && apt-get install -y nodejs postgresql-client
RUN mkdir /speakerinnen_liste
WORKDIR /speakerinnen_liste
Expand Down
17 changes: 12 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# frozen_string_literal: true

source 'https://rubygems.org'
ruby '2.7.7'
ruby '3.1.1'
gem 'rails', '6.0.3.6'

# Needed for Javascript Runtime
Expand All @@ -11,15 +11,19 @@ gem 'mini_racer'
# used in the rail 5.2 version
gem 'bootsnap', '~> 1.4.2'

gem 'faker', '1.9.1'
# rexml gem is a bundled gem since Ruby 3.0.0.
gem 'rexml', '~> 3.2.4'

gem 'faker', '~> 3.1', '>= 3.1.1'
gem 'normalize-rails'

gem 'deadweight', require: 'deadweight/hijack/rails'

gem 'kaminari'
gem 'mime-types'

gem 'acts-as-taggable-on', '~> 6.0'
# gem 'acts-as-taggable-on', '~> 6.0'
gem 'acts-as-taggable-on', '~> 9.0', '>= 9.0.1'
gem 'auto_html', '~>1.6.4'
gem 'devise', '~> 4.7'
gem 'invisible_captcha'
Expand Down Expand Up @@ -48,7 +52,6 @@ gem 'elasticsearch-model', github: 'elastic/elasticsearch-rails', branch: '6.x'
gem 'elasticsearch-rails', github: 'elastic/elasticsearch-rails', branch: '6.x'
gem 'record_tag_helper', '~> 1.0'
gem 'exception_notification'
gem 'honeycomb-beeline'

gem 'coffee-rails', '~> 5.0.0'
gem 'sassc-rails'
Expand All @@ -66,6 +69,9 @@ gem "sentry-raven"
gem 'image_processing', '~> 1.2'
gem 'rack-timeout'

# downgrade gem to solve parsing error https://stackoverflow.com/questions/74725359/ruby-on-rails-legacy-application-update-generates-gem-psych-alias-error-psychb
gem 'psych', '< 4.0'

group :development do
gem 'better_errors'
gem 'bullet'
Expand All @@ -76,13 +82,14 @@ end

group :development, :test do
gem 'byebug'
gem 'capybara', '~> 3.12.0'
gem 'capybara', '~> 3.38'
gem 'guard'
gem 'guard-rspec'
gem 'pry'
gem 'rspec-rails'
gem 'rubocop', '~> 0.62.0'
gem 'selenium-webdriver', '3.141.0'
gem 'webrick', '~> 1.7'
end

group :test do
Expand Down
Loading

0 comments on commit c565776

Please sign in to comment.