Skip to content
This repository has been archived by the owner on Dec 28, 2023. It is now read-only.

645: Gems and dockerfile updates #646

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open
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 .github/workflows/ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:

strategy:
matrix:
ruby-version: ["3.1.4"]
ruby-version: ["3.2.2"]
steps:
- uses: actions/checkout@v2
- name: Install dependent libraries
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruby-3.1.4
ruby-3.2.2
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:3.1.4
FROM ruby:3.2.2

LABEL MAINTAINER Codeminer42 <[email protected]>

Expand All @@ -25,7 +25,7 @@ RUN apt-get update \
&& chown -R app:app $BUNDLE_PATH

# Install chrome and chromedriver for selenium
ENV CHROME_VERSION 106.0.5249.61
ENV CHROME_VERSION 114.0.5735.90
RUN wget http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${CHROME_VERSION}-1_amd64.deb \
&& dpkg -i google-chrome-stable_${CHROME_VERSION}-1_amd64.deb || true \
&& apt-get -f install -y \
Expand Down
25 changes: 11 additions & 14 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,18 @@ source 'https://rubygems.org'

git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '3.1.4'
ruby '3.2.2'

gem 'rails', '~> 7.0.7'
gem 'rails', '~> 7.1.1'

gem 'bootsnap', require: false

gem 'activeadmin', '~> 2.13.1'
gem 'activeadmin', '> 2.13.1'
gem 'autoprefixer-rails', '~> 10.4.2.0'
gem 'cancancan', '~> 3.3.0'
gem 'carrierwave', '~> 2.2.5'
gem 'devise', '~> 4.8.1'
gem 'devise-two-factor',
git: 'https://github.com/eoinkelly/devise-two-factor',
branch: 'rails-7-support',
ref: '7de6c315b507c41e6ee288ea0bdf3a070416bd17'
gem 'devise', '~> 4.8.0'
gem 'devise-two-factor', '~> 5.0.0'
gem 'draper'
gem 'draper-cancancan', '~> 1.1.1'
gem 'jquery-rails'
Expand Down Expand Up @@ -47,7 +44,7 @@ gem 'business_time'
gem 'github_api', '~> 0.18.2'
gem 'httparty'
gem 'money-rails', '~> 1.12'
gem 'ransack', '~> 2.3'
gem 'ransack', '~> 4.0'
Lucas-Boeira marked this conversation as resolved.
Show resolved Hide resolved

gem 'sidekiq', "~> 6.5.12"

Expand All @@ -62,7 +59,7 @@ gem 'font-awesome-sass', '~> 5.13'
gem 'jquery-easing-rails'
gem 'jquery_mask_rails', '~> 0.1.0'
gem 'normalize-rails', '~> 4.1.1'
gem 'validates_timeliness', '~> 6.0.0.beta2', github: "mitsuru/validates_timeliness", branch: "rails7"
gem 'validates_timeliness', '>= 6.0.1'

gem 'aasm', '~> 5.0', '>= 5.0.8'
gem 'active_admin_flat_skin'
Expand All @@ -80,8 +77,8 @@ end

gem 'inline_svg', '~> 1.9'
gem 'puma'
gem 'rswag-api', '~> 2.5.1'
gem 'rswag-ui', '~> 2.5.1'
gem 'rswag-api', '~> 2.13.0'
gem 'rswag-ui', '~> 2.13.0'
gem "tailwindcss-rails", "~> 2.0"

group :test do
Expand Down Expand Up @@ -119,11 +116,11 @@ group :development, :test do
gem 'pry-rails'
gem 'pry-remote', '~> 0.1.8'
gem 'rspec-rails'
gem 'rswag-specs', '~> 2.5.1'
gem 'rswag-specs', '~> 2.13.0'
gem 'rubocop', require: false
gem 'rubocop-faker', '~> 1.1'
end

group :development, :test, :staging do
gem 'faker', '~> 2.14.0'
gem 'faker', '~> 2.23.0'
end
Loading
Loading