Skip to content

Commit 4cf25ed

Browse files
committed
Merge branch 'development'
2 parents f7cab41 + 45a906e commit 4cf25ed

30 files changed

+485
-191
lines changed

.ruby-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.7.6
1+
3.1.2

Gemfile

+10-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
source 'https://rubygems.org'
22

3-
ruby '2.7.6'
3+
ruby '3.1.2'
44

55
git_source(:github) do |repo_name|
66
repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
@@ -26,7 +26,11 @@ gem 'aasm'
2626

2727

2828
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
29-
gem 'rails', '~> 5.2.6'
29+
gem 'rails', '~> 6.1'
30+
gem 'activesupport', '~> 6.1'
31+
gem 'actionpack', '~> 6.1'
32+
33+
gem 'net-smtp'
3034
# Use postgres as the database for Active Record
3135
gem 'pg'
3236
# Use Puma as the app server
@@ -67,18 +71,18 @@ group :development, :test do
6771
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
6872
gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
6973
# Adds support for Capybara system testing and selenium driver
70-
gem 'capybara', '~> 2.13'
74+
gem 'capybara'
7175
gem 'selenium-webdriver'
7276
gem 'pry'
7377
end
7478

7579
group :development do
7680
# Access an IRB console on exception pages or by using <%= console %> anywhere in the code.
77-
gem 'web-console', '>= 3.3.0'
78-
gem 'listen', '>= 3.0.5', '< 3.2'
81+
gem 'web-console'
82+
gem 'listen'
7983
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
8084
gem 'spring'
81-
gem 'spring-watcher-listen', '~> 2.0.0'
85+
gem 'spring-watcher-listen'
8286
end
8387

8488
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem

0 commit comments

Comments
 (0)