Merge branch 'brotandgames:master' into master

lape · Feb 19, 2024 · d91b830 · d91b830
2 parents 0d72d1e + c233efd
commit d91b830
Show file tree

Hide file tree

Showing 5 changed files with 122 additions and 125 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -23,6 +23,8 @@ A clear and concise description of what you expected to happen.
 **Screenshots**
 If applicable, add screenshots to help explain your problem.
 
+Use Markdown code blocks or attachments for logs and code.
+
 **Desktop (please complete the following information):**
  - OS: [e.g. iOS]
  - Browser [e.g. chrome, safari]

diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-3.2.2
+3.3.0
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:3.2.2-alpine
+FROM ruby:3.3.0-alpine3.18
 
 # for postgres: postgresql-dev
 RUN apk add --no-cache \

diff --git a/Gemfile b/Gemfile
@@ -3,8 +3,6 @@
 source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby "3.2.2"
-
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem "rails", "~> 6.1"
 # Use sqlite3 as the database for Active Record