Skip to content

Commit

Permalink
Merge pull request #92 from uwent/update
Browse files Browse the repository at this point in the history
Update
  • Loading branch information
bzbradford authored Aug 5, 2024
2 parents a425acb + 40f6549 commit fc9782e
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 21 deletions.
9 changes: 5 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
version: 2.1
orbs:
ruby: circleci/ruby@2.0.0
ruby: circleci/ruby@2.1.3

jobs:
build:
docker:
- image: cimg/ruby:3.3.3-node
- image: cimg/ruby:3.3.0-node
environment:
PG_HOST: localhost
PG_USER: postgres
RAILS_ENV: test
RACK_ENV: test
- image: cimg/postgres:14.5
- image: cimg/postgres:16.3
environment:
POSTGRES_USER: postgres
POSTGRES_DB: soils_ag_wx_test
Expand All @@ -20,7 +20,8 @@ jobs:
resource_class: large
steps:
- checkout
- ruby/install-deps
- ruby/install-deps:
key: gems-{{ checksum ".ruby-version" }}
- run:
name: Set up database
command: bundle exec rails db:setup
Expand Down
31 changes: 16 additions & 15 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ GEM
csv (3.3.0)
date (3.3.4)
diff-lcs (1.5.1)
docile (1.4.0)
docile (1.4.1)
dotenv (3.1.2)
dotenv-rails (3.1.2)
dotenv (= 3.1.2)
Expand Down Expand Up @@ -177,7 +177,7 @@ GEM
guard (~> 2.1)
guard-compat (~> 1.1)
rspec (>= 2.99.0, < 4.0)
hashdiff (1.1.0)
hashdiff (1.1.1)
httparty (0.22.0)
csv
mini_mime (>= 1.0.0)
Expand Down Expand Up @@ -229,6 +229,7 @@ GEM
date
net-protocol
net-pop (0.1.2)
net-protocol
net-protocol (0.2.2)
timeout
net-scp (4.0.0)
Expand All @@ -239,17 +240,17 @@ GEM
net-protocol
net-ssh (7.2.3)
nio4r (2.7.3)
nokogiri (1.16.6-aarch64-linux)
nokogiri (1.16.7-aarch64-linux)
racc (~> 1.4)
nokogiri (1.16.6-arm-linux)
nokogiri (1.16.7-arm-linux)
racc (~> 1.4)
nokogiri (1.16.6-arm64-darwin)
nokogiri (1.16.7-arm64-darwin)
racc (~> 1.4)
nokogiri (1.16.6-x86-linux)
nokogiri (1.16.7-x86-linux)
racc (~> 1.4)
nokogiri (1.16.6-x86_64-darwin)
nokogiri (1.16.7-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.16.6-x86_64-linux)
nokogiri (1.16.7-x86_64-linux)
racc (~> 1.4)
notiffany (0.1.3)
nenv (~> 0.1)
Expand All @@ -258,18 +259,18 @@ GEM
parser (3.3.4.0)
ast (~> 2.4.1)
racc
pg (1.5.6)
pg (1.5.7)
pry (0.14.2)
coderay (~> 1.1)
method_source (~> 1.0)
pry-rails (0.3.11)
pry (>= 0.13.0)
psych (5.1.2)
stringio
public_suffix (6.0.0)
public_suffix (6.0.1)
puma (6.4.2)
nio4r (~> 2.0)
racc (1.8.0)
racc (1.8.1)
rack (3.1.7)
rack-session (2.0.0)
rack (>= 3.0.0)
Expand Down Expand Up @@ -325,7 +326,7 @@ GEM
reline (0.5.9)
io-console (~> 0.5)
render_async (2.1.11)
rexml (3.3.2)
rexml (3.3.4)
strscan
rspec (3.13.0)
rspec-core (~> 3.13.0)
Expand Down Expand Up @@ -386,7 +387,7 @@ GEM
sprockets (4.2.1)
concurrent-ruby (~> 1.0)
rack (>= 2.2.4, < 4)
sprockets-rails (3.5.1)
sprockets-rails (3.5.2)
actionpack (>= 6.1)
activesupport (>= 6.1)
sprockets (>= 3.0.0)
Expand All @@ -395,7 +396,7 @@ GEM
net-scp (>= 1.1.2)
net-sftp (>= 2.1.2)
net-ssh (>= 2.8.0)
standard (1.39.1)
standard (1.39.2)
language_server-protocol (~> 3.17.0.2)
lint_roller (~> 1.0)
rubocop (~> 1.64.0)
Expand Down Expand Up @@ -433,7 +434,7 @@ GEM
whenever (1.0.0)
chronic (>= 0.6.3)
will_paginate (4.0.1)
zeitwerk (2.6.16)
zeitwerk (2.6.17)

PLATFORMS
aarch64-linux
Expand Down
4 changes: 2 additions & 2 deletions app/mailers/application_mailer.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
class ApplicationMailer < ActionMailer::Base
default(
from: "AgWeather <agweather@cals.wisc.edu>",
reply_to: "No Reply <noreply@cals.wisc.edu>"
from: "AgWeather <noreply@cals.wisc.edu>",
reply_to: "AgWeather <noreply@cals.wisc.edu>"
)
end

0 comments on commit fc9782e

Please sign in to comment.