Skip to content

Commit f6f9fec

Browse files
committed
Merge branch 'main' of https://git.heroku.com/tamu-ta
2 parents 450df6c + 892e821 commit f6f9fec

File tree

3 files changed

+14
-3
lines changed

3 files changed

+14
-3
lines changed

Gemfile

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@
33
source "https://rubygems.org"
44
gem "csv"
55
gem "ransack"
6+
ruby '3.4.1'
67
# Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
78
gem "rails", "~> 7.2.2", ">= 7.2.2.1"
89
# The original asset pipeline for Rails [https://github.com/rails/sprockets-rails]
910
gem "sprockets-rails"
1011
# Use sqlite3 as the database for Active Record
11-
gem "sqlite3", ">= 1.4"
12+
#gem "sqlite3", ">= 1.4"
1213
# Use the Puma web server [https://github.com/puma/puma]
1314
gem "puma", ">= 5.0"
1415
# Use JavaScript with ESM import maps [https://github.com/rails/importmap-rails]
@@ -34,8 +35,11 @@ gem "bootsnap", require: false
3435

3536
# Use Active Storage variants [https://guides.rubyonrails.org/active_storage_overview.html#transforming-images]
3637
# gem "image_processing", "~> 1.2"
37-
38+
group :production do
39+
gem 'pg' # for Heroku deployment
40+
end
3841
group :development, :test do
42+
gem 'sqlite3'
3943
# See https://guides.rubyonrails.org/debugging_rails_applications.html#debugging-with-the-debug-gem
4044
gem "debug", platforms: %i[mri mswin mswin64 mingw x64_mingw],
4145
require: "debug/prelude"
@@ -55,6 +59,7 @@ group :development do
5559
# gem "error_highlight", ">= 0.4.0", platforms: [ :ruby ]
5660
end
5761

62+
5863
group :test do
5964
# Use system testing [https://guides.rubyonrails.org/testing.html#system-testing]
6065
gem "capybara"

Gemfile.lock

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,7 @@ GEM
217217
parser (3.3.7.1)
218218
ast (~> 2.4.1)
219219
racc
220+
pg (1.5.9)
220221
pp (0.6.2)
221222
prettyprint
222223
prettyprint (0.2.0)
@@ -412,6 +413,7 @@ DEPENDENCIES
412413
devise
413414
importmap-rails
414415
jbuilder
416+
pg
415417
puma (>= 5.0)
416418
rack_session_access
417419
rails (~> 7.2.2, >= 7.2.2.1)
@@ -421,11 +423,14 @@ DEPENDENCIES
421423
selenium-webdriver
422424
simplecov
423425
sprockets-rails
424-
sqlite3 (>= 1.4)
426+
sqlite3
425427
stimulus-rails
426428
turbo-rails
427429
tzinfo-data
428430
web-console
429431

432+
RUBY VERSION
433+
ruby 3.4.1p0
434+
430435
BUNDLED WITH
431436
2.6.3

Procfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
web: bundle exec rails server -p $PORT

0 commit comments

Comments
 (0)