Skip to content

Commit

Permalink
Merge pull request #15 from cul/v3.1.0-pr
Browse files Browse the repository at this point in the history
v3.1.0 updates via PR #15.
  • Loading branch information
fcd1 authored Dec 10, 2024
2 parents ee12a61 + cad3112 commit 7718dd5
Show file tree
Hide file tree
Showing 40 changed files with 583 additions and 153 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,5 @@

# Ignore simplecov coverage report
/coverage

/config/master.key
7 changes: 6 additions & 1 deletion Capfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
# default requires
require 'capistrano/setup'
require 'capistrano/deploy'

# Git SCM plugin
require 'capistrano/scm/git'
install_plugin Capistrano::SCM::Git

# additional optional modules used by clio
require 'capistrano/rvm'
require 'capistrano/bundler'
require 'capistrano/rails/assets'
require 'capistrano/rails/migrations'
require 'capistrano/passenger'
require 'capistrano/passenger'
6 changes: 4 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ source 'https://rubygems.org'

ruby "3.2.2"

gem 'rails', '~> 7.1.2'
gem 'rails', '~> 7.2.2'
gem 'mysql2'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'
Expand Down Expand Up @@ -52,13 +52,15 @@ group :development, :test do

# simplecov for test coverage
gem 'simplecov', '~> 0.22', require: false

gem 'factory_bot_rails'
end

group :development do
# Use Puma as the app server
gem 'puma'
# Use Capistrano for deployment
gem 'capistrano', '~> 3.17.3', require: false
gem 'capistrano', '~> 3.19.2', require: false
# Rails and Bundler integrations were moved out from Capistrano 3
gem 'capistrano-rails', '~> 1.4', require: false
gem 'capistrano-bundler', '~> 1.1', require: false
Expand Down
Loading

0 comments on commit 7718dd5

Please sign in to comment.