Skip to content

Commit

Permalink
Merge pull request #212 from GSA/dependabot/bundler/dev/propshaft-1.1.0
Browse files Browse the repository at this point in the history
Bump propshaft from 0.9.1 to 1.1.0
  • Loading branch information
stepchud authored Oct 21, 2024
2 parents f7f53fa + 9157cb8 commit b6f5415
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 13 deletions.
2 changes: 0 additions & 2 deletions .env_login
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,3 @@ export LOGOUT_REDIRECT_EVAL_URL=http://localhost:3000/
export PHOENIX_URI="http://localhost:4000"
export LOGIN_SECRET="f4d3c40a00a8e6ed72fae5204d9ddacd40f087865d40803a6fcfb935591a271838533f06081067dac24c0085c74123e7e1c8b3e0ab562c6645b17eb769854d0d"
export JWT_SECRET="fc28c5738ca45162f61126e770a8fbdbd938d0fedcfe8fbb9f851b855b0264866364a9130e96aca8b1977e9f58edf064f1aa435ceccf415ff22fd3c24adba320"

export APP_DOMAIN="localhost"
3 changes: 3 additions & 0 deletions .envrc
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,8 @@ use nix
mkdir -p .nix-bundler
export BUNDLE_PATH=./.nix-bundler

# hook for rbenv locally
which rbenv &> /dev/null && eval "$(rbenv init - -zsh)"

# Login Env Vars
source .env_login
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ gem "faraday"
gem "jwt"

# Use simple asset pipeline
gem "propshaft", "~> 0.9.1"
gem "propshaft", "~> 1.1.0"
gem "cssbundling-rails", "~> 1.4"
gem "jsbundling-rails", "~> 1.3"

Expand Down
6 changes: 3 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ GEM
ast (~> 2.4.1)
racc
pg (1.5.8)
propshaft (0.9.1)
propshaft (1.1.0)
actionpack (>= 7.0.0)
activesupport (>= 7.0.0)
rack
Expand Down Expand Up @@ -357,7 +357,7 @@ GEM
websocket-extensions (0.1.5)
xpath (3.2.0)
nokogiri (~> 1.8)
zeitwerk (2.7.0)
zeitwerk (2.7.1)

PLATFORMS
aarch64-linux
Expand All @@ -383,7 +383,7 @@ DEPENDENCIES
jsbundling-rails (~> 1.3)
jwt
pg
propshaft (~> 0.9.1)
propshaft (~> 1.1.0)
pry
puma (>= 6.4.3)
rails (~> 7.2.1, >= 7.2.1.1)
Expand Down
7 changes: 0 additions & 7 deletions db/structure.sql
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,6 @@ SET xmloption = content;
SET client_min_messages = warning;
SET row_security = off;

--
-- Name: public; Type: SCHEMA; Schema: -; Owner: -
--

-- *not* creating schema, since initdb creates it


--
-- Name: oban_job_state; Type: TYPE; Schema: public; Owner: -
--
Expand Down

0 comments on commit b6f5415

Please sign in to comment.