Merge branch 'main' into add_bandai_dojo

Author: nacchan99

.devcontainer/devcontainer.json

@@ -3,14 +3,17 @@
 // Config options: https://github.com/microsoft/vscode-dev-containers/tree/main/containers/ruby
 {
   "name": "coderdojo.jp",
+  "dockerComposeFile": "../docker-compose.yml",
+  "service": "rails",
+  "workspaceFolder": "/app",
+  "overrideCommand": true,
 
-  // Universal is well-customized image for Codespaces:
-  // https://hub.docker.com/_/microsoft-devcontainers-universal
-  "image": "mcr.microsoft.com/devcontainers/universal:latest",
-
-  // Use Ruby image if you want to pin Ruby version like '3.2'
-  // https://github.com/devcontainers/images/tree/main/src/ruby
-  //"image": "mcr.microsoft.com/devcontainers/ruby:3.0",
+  "containerEnv": {
+    "DATABASE_USER": "postgres",
+    "DATABASE_PASSWORD": "password",
+    "DATABASE_HOST": "db",
+    "DATABASE_PORT": "5432"
+  },
 
   // Enable learners to choose an affordable spec, starting at minimum one.
   //"hostRequirements": {
@@ -21,17 +24,15 @@
 
   "waitFor": "onCreateCommand",
   "onCreateCommand": "gem install solargraph -N",
-  //"onCreateCommand": "",
   //# => Solargraph gem not found. Run `gem install solargraph` or update your Gemfile.
   "updateContentCommand": "bundle install",
-  "postCreateCommand": "",
   "postAttachCommand": {
-    "server": "rails server"
+    "server": "rm -f /app/tmp/pids/server.pid && rails server -b 0.0.0.0"
   },
   "customizations": {
     "codespaces": {
       "openFiles": [
-        "app/views/home/show.html.haml"
+        "app/views/home/show.html.erb"
       ]
     },
     "vscode": {
@@ -47,7 +48,7 @@
 	//"ruby.lint": { "rubocop": true },
 	//"ruby.intellisense": "rubyLocate",
 	"editor.tabSize": 2,
-	"editor.renderWhitespace": false,
+	"editor.renderWhitespace": "none",
 	"files.associations": { "*.erb": "erb" },
 	"emmet.includeLanguages": { "erb": "html" },
 

.gitignore

@@ -36,3 +36,6 @@ public/assets/*
 
 # rspec
 spec/examples.txt
+
+# Credentials
+/config/master.key

.ruby-version

@@ -1 +1 @@
-3.1.6
+3.2.8

Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:3.1.6
+FROM ruby:3.2.8
 
 ENV LANG C.UTF-8
 

Gemfile

@@ -1,36 +1,36 @@
 source 'https://rubygems.org'
-ruby '3.1.6'
+ruby '3.2.8'
 
 gem 'bootsnap'
 gem 'pg'
 gem 'puma'
 gem 'puma_worker_killer'
-gem 'rails', '~> 7.0'
+gem 'rails', '~> 7.1.5'
 
 gem 'coffee-rails'
 gem 'jbuilder'
 gem 'jquery-rails'
 
 gem 'bootstrap-sass'
 gem 'font-awesome-rails'
-gem 'haml-rails'
-gem 'rails-html-sanitizer', '~> 1.4.4'
+gem 'rails-html-sanitizer'
 gem 'sass-rails', '>= 5'
 gem 'simple_grid_rails'
 gem 'uglifier'
 
-# Specify to 1.3.4 to prevent error
-# TODO: This can be removed on Rails 7.1
-# https://github.com/rails/rails/issues/54260
-# https://stackoverflow.com/questions/79360526/uninitialized-constant-activesupportloggerthreadsafelevellogger-nameerror
-gem 'concurrent-ruby', '1.3.4'
+# Rails 7.1では不要になったため、バージョン制限を解除
+gem 'concurrent-ruby'
 
 # For handling error
 # https://github.com/yuki24/rambulance
 # Using patch gem due to NameError: uninitialized constant ApplicationHelper
 # https://github.com/coderdojo-japan/coderdojo.jp/pull/1631#issuecomment-2424826474
 gem 'rambulance', git: 'https://github.com/yasslab/rambulance'
 
+# Error Monitoring by Airbrake
+# https://github.com/airbrake/airbrake
+gem 'airbrake'
+
 # For redirection
 gem 'rack-host-redirect'
 
@@ -94,7 +94,7 @@ group :development, :test do
 
   gem 'capybara'
   gem 'factory_bot_rails'
-  gem 'rspec-rails', '~> 4.0'
+  gem 'rspec-rails', '~> 6.1.1'
   gem 'selenium-webdriver'
 
   gem 'dotenv-rails'