Merge develop to master

.github/pull_request_template.md

@@ -0,0 +1,13 @@
+close #
+
+## 概要
+
+- 例）トップページのメッセージ概要
+
+## 修正内容の検証方法
+
+- 例）アプリケーションを`rails s`コマンドを実行して、`localhost`にアクセス
+
+## この修正が正しい理由
+
+- 例）ローカル環境で正常に表示されることを確認済み

Gemfile

@@ -4,11 +4,11 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 ruby '2.6.3'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '~> 6.0.2', '>= 6.0.2.1'
+gem 'rails', '~> 6.0.3'
 # Use mysql as the database for Active Record
 gem 'mysql2', '>= 0.4.4'
 # Use Puma as the app server
-gem 'puma', '~> 4.1'
+gem 'puma', '~> 5.0'
 # Use SCSS for stylesheets
 gem 'sass-rails', '>= 6'
 # Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker
@@ -36,7 +36,7 @@ end
 group :development do
   # Access an interactive console on exception pages or by calling 'console' anywhere in the code.
   gem 'web-console', '>= 3.3.0'
-  gem 'listen', '>= 3.0.5', '< 3.2'
+  gem 'listen', '>= 3.0.5', '< 3.4'
   # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
   gem 'spring'
   gem 'spring-watcher-listen', '~> 2.0.0'
@@ -61,8 +61,10 @@ gem 'devise-i18n'
 gem 'devise-i18n-views'
 
 gem 'carrierwave'
-gem 'fog'
+gem 'fog-aws'
 
 gem 'kaminari'
 
-gem 'rack-attack'
+gem 'rack-attack'
+
+gem 'ransack'