Skip to content

Commit

Permalink
Merge pull request #133 from cincinnatirb/next-meeting-fix
Browse files Browse the repository at this point in the history
Next meeting fix
  • Loading branch information
agilous authored Sep 23, 2023
2 parents d3844d5 + da1565a commit 1d5e81f
Show file tree
Hide file tree
Showing 231 changed files with 303 additions and 329 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/rubyonrails.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
uses: actions/checkout@v3
# Add or replace dependency steps here
- name: Install Ruby and gems
uses: ruby/setup-ruby@ee2113536afb7f793eed4ce60e8d3b26db912da4 # v1.127.0
uses: ruby/setup-ruby@v1
with:
bundler-cache: true
# Add or replace database setup steps here
Expand All @@ -46,7 +46,7 @@ jobs:
- name: Checkout code
uses: actions/checkout@v3
- name: Install Ruby and gems
uses: ruby/setup-ruby@ee2113536afb7f793eed4ce60e8d3b26db912da4 # v1.127.0
uses: ruby/setup-ruby@v1
with:
bundler-cache: true
# Add or replace any other lints here
Expand Down
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
nodejs 16.13.0
ruby 3.1.2
ruby 3.2.2
yarn 1.22.4
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# syntax = docker/dockerfile:1

# Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile
ARG RUBY_VERSION=3.1.2
ARG RUBY_VERSION=3.2.2
FROM ruby:$RUBY_VERSION-slim as base

LABEL fly_launch_runtime="rails"
Expand Down
8 changes: 4 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
source 'https://rubygems.org'
ruby '3.1.2'
ruby '3.2.2'

gem 'bootsnap'
gem 'coffee-rails'
Expand All @@ -13,9 +13,9 @@ gem 'newrelic_rpm'
gem 'nokogiri', '>= 1.13.10'
gem 'oauth'
gem 'pg'
gem 'puma', '>= 5.5.1'
gem 'puma', '>= 5.6.7'
gem 'rack'
gem 'rails', '>= 7.0.5.1'
gem 'rails', '>= 7.0.7.1'
gem 'rails-html-sanitizer', '>= 1.4.4'
gem 'rake', '>= 10'
gem 'sass-rails'
Expand Down Expand Up @@ -54,10 +54,10 @@ group :test do
gem 'database_cleaner-active_record'
gem 'faker'
gem 'rails-controller-testing'
gem 'selenium-webdriver'
gem 'shoulda-matchers'
gem 'simplecov', require: false
gem 'vcr'
gem 'webdrivers'
gem 'webmock'
end

Expand Down
Loading

0 comments on commit 1d5e81f

Please sign in to comment.