Skip to content

Commit 7f68d58

Browse files
authored
Merge pull request #26 from CruGlobal/ruby-upgrade
[no-jira] update ruby 3.3.5 and rails 7.0.8.7
2 parents c534adf + 3f86dd8 commit 7f68d58

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+336
-7412
lines changed

.gitattributes

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,5 @@
33
# Mark the database schema as having been generated.
44
db/schema.rb linguist-generated
55

6-
# Mark the yarn lockfile as having been generated.
7-
yarn.lock linguist-generated
8-
96
# Mark any vendored files as having been vendored.
107
vendor/* linguist-vendored

.gitignore

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,21 @@
1818
!/tmp/pids/
1919
!/tmp/pids/.keep
2020

21+
# Ignore uploaded files in development.
22+
/storage/*
23+
!/storage/.keep
24+
/tmp/storage/*
25+
!/tmp/storage/
26+
!/tmp/storage/.keep
2127

2228
/public/assets
23-
.byebug_history
2429

2530
# Ignore master key for decrypting credentials and more.
2631
/config/master.key
2732

2833
/public/packs
2934
/public/packs-test
3035
/node_modules
31-
/yarn-error.log
32-
yarn-debug.log*
33-
.yarn-integrity
3436

3537
.env.*
3638
.idea/

.tool-versions

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ruby 3.3.5

Gemfile

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,36 @@
11
source "https://rubygems.org"
22
git_source(:github) { |repo| "https://github.com/#{repo}.git" }
33

4-
ruby "2.7.4"
4+
ruby "3.3.5"
55

66
gem "awesome_print"
7-
gem "rails", "~> 6.1.3", ">= 6.1.3.2"
8-
gem "pg", "~> 1.1"
7+
gem 'rails', '~> 7.0.8'
8+
gem "pg"
99
gem "puma", "~> 5.0"
1010
gem "sprockets-rails", require: "sprockets/railtie"
1111

12-
gem "webpacker", "~> 5.0"
1312
# Use Active Model has_secure_password
1413
# gem 'bcrypt', '~> 3.1.7'
1514

1615
# Reduces boot times through caching; required in config/boot.rb
17-
gem "bootsnap", ">= 1.4.4", require: false
16+
gem "bootsnap", require: false
1817

1918
gem "rest-client"
20-
gem "pry-byebug"
19+
gem "nokogiri", ">= 1.16.0"
2120

2221
group :development, :test do
2322
gem "dotenv-rails", "~> 2.7.6", require: "dotenv/rails-now"
2423
gem "standard"
24+
gem "pry-byebug"
2525
end
2626

2727
group :development do
28-
# Access an interactive console on exception pages or by calling 'console' anywhere in the code.
29-
gem "web-console", ">= 4.1.0"
30-
gem "rack-mini-profiler", "~> 2.0"
31-
gem "listen", "~> 3.3"
32-
gem "spring"
28+
# Use console on exceptions pages [https://github.com/rails/web-console]
29+
gem "web-console"
30+
31+
# Add speed badges [https://github.com/MiniProfiler/rack-mini-profiler]
32+
# gem "rack-mini-profiler"
33+
34+
# Speed up commands on slow machines / big apps [https://github.com/rails/spring]
35+
# gem "spring"
3336
end

0 commit comments

Comments
 (0)