Skip to content

Commit 849e72c

Browse files
committed
Merge branch 'upgrade_gems_to_latest' of https://github.com/juliancheal/examples into rails
2 parents ae81373 + 67d7ed6 commit 849e72c

File tree

11 files changed

+353
-1333
lines changed

11 files changed

+353
-1333
lines changed

frameworks-rails-rswag/.gitignore

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
# See https://help.github.com/articles/ignoring-files for more about ignoring files.
2+
#
3+
# Temporary files generated by your text editor or operating system
4+
# belong in git's global ignore instead:
5+
# `$XDG_CONFIG_HOME/git/ignore` or `~/.config/git/ignore`
6+
7+
# Ignore bundler config.
8+
/.bundle
9+
10+
# Ignore all environment files.
11+
/.env*
12+
13+
# Ignore MacOS files
14+
.DS_Store
15+
16+
# Ignore all logfiles and tempfiles.
17+
/log/*
18+
/tmp/*
19+
!/log/.keep
20+
!/tmp/.keep
21+
22+
# Ignore pidfiles, but keep the directory.
23+
/tmp/pids/*
24+
!/tmp/pids/
25+
!/tmp/pids/.keep
26+
27+
# Ignore storage (uploaded files in development and any SQLite databases).
28+
/storage/*
29+
!/storage/.keep
30+
/tmp/storage/*
31+
!/tmp/storage/
32+
!/tmp/storage/.keep
33+
34+
/public/assets
35+
36+
# Ignore key files for decrypting credentials and more.
37+
/config/*.key
38+
39+
40+
/app/assets/builds/*
41+
!/app/assets/builds/.keep
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ruby-3.4.3
1+
ruby-3.4.7

frameworks-rails-rswag/Gemfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
source "https://rubygems.org"
22

33
# Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
4-
gem "rails", "~> 8.0.2"
4+
gem 'rails', '~> 8.1', '>= 8.1.1'
55
# Use sqlite3 as the database for Active Record
66
gem "sqlite3", ">= 2.1"
77
# Use the Puma web server [https://github.com/puma/puma]
@@ -44,12 +44,12 @@ group :development, :test do
4444

4545
# Omakase Ruby styling [https://github.com/rails/rubocop-rails-omakase/]
4646
gem "rubocop-rails-omakase", require: false
47-
48-
# RSwag for API documentation and testing
49-
gem 'rswag-specs'
5047

5148
# RSpec for testing
5249
gem 'rspec-rails'
50+
51+
# RSwag for API documentation and testing
52+
gem 'rswag-specs'
5353
end
5454

5555
# API Documentation

0 commit comments

Comments
 (0)