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

Commit 4d8b85e

Browse files
committed
645: Gems and dockerfile updates fix
1 parent 3061e6a commit 4d8b85e

File tree

3 files changed

+205
-189
lines changed

3 files changed

+205
-189
lines changed

Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ RUN apt-get update \
1717
&& apt-get install -y \
1818
build-essential \
1919
postgresql-client \
20-
curl \
2120
&& groupadd --gid ${GROUP_ID} app \
2221
&& useradd --system --create-home --no-log-init --uid ${USER_ID} --gid ${GROUP_ID} --groups sudo app \
2322
&& mkdir /var/app && chown -R app:app /var/app \

Gemfile

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,16 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
66

77
ruby '3.1.4'
88

9-
gem 'rails', '~> 7.0.8'
9+
gem 'rails', '~> 7.1.2'
1010

1111
gem 'bootsnap', require: false
1212

13-
gem 'activeadmin', '~> 2.13.1'
13+
gem 'activeadmin', '> 2.14.0'
1414
gem 'autoprefixer-rails', '~> 10.4.2.0'
1515
gem 'cancancan', '~> 3.3.0'
1616
gem 'carrierwave', '~> 2.2.5'
17-
gem 'devise', '~> 4.8.1'
18-
gem 'devise-two-factor',
19-
git: 'https://github.com/eoinkelly/devise-two-factor',
20-
branch: 'rails-7-support',
21-
ref: '7de6c315b507c41e6ee288ea0bdf3a070416bd17'
17+
gem 'devise', '~> 4.8.0'
18+
gem 'devise-two-factor', '~> 5.0.0'
2219
gem 'draper'
2320
gem 'draper-cancancan', '~> 1.1.1'
2421
gem 'jquery-rails'
@@ -47,7 +44,7 @@ gem 'business_time'
4744
gem 'github_api', '~> 0.18.2'
4845
gem 'httparty'
4946
gem 'money-rails', '~> 1.12'
50-
gem 'ransack', '~> 2.3'
47+
gem 'ransack', '~> 4.0'
5148

5249
gem 'sidekiq', "~> 6.5.12"
5350

@@ -62,7 +59,7 @@ gem 'font-awesome-sass', '~> 5.13'
6259
gem 'jquery-easing-rails'
6360
gem 'jquery_mask_rails', '~> 0.1.0'
6461
gem 'normalize-rails', '~> 4.1.1'
65-
gem 'validates_timeliness', '~> 6.0.0.beta2', github: "mitsuru/validates_timeliness", branch: "rails7"
62+
gem 'validates_timeliness', '> 6.0.0'
6663

6764
gem 'aasm', '~> 5.0', '>= 5.0.8'
6865
gem 'active_admin_flat_skin'
@@ -80,8 +77,8 @@ end
8077

8178
gem 'inline_svg', '~> 1.9'
8279
gem 'puma'
83-
gem 'rswag-api', '~> 2.5.1'
84-
gem 'rswag-ui', '~> 2.5.1'
80+
gem 'rswag-api', '~> 2.13.0'
81+
gem 'rswag-ui', '~> 2.13.0'
8582
gem "tailwindcss-rails", "~> 2.0"
8683

8784
group :test do
@@ -119,7 +116,7 @@ group :development, :test do
119116
gem 'pry-rails'
120117
gem 'pry-remote', '~> 0.1.8'
121118
gem 'rspec-rails'
122-
gem 'rswag-specs', '~> 2.5.1'
119+
gem 'rswag-specs', '~> 2.13.0'
123120
gem 'rubocop', require: false
124121
gem 'rubocop-faker', '~> 1.1'
125122
end

0 commit comments

Comments
 (0)