Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

switch back to released devise gem #331

Merged
merged 2 commits into from
Dec 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ gem "jsonapi-rails", "~> 0.4.0"
gem "doorkeeper", "~> 5.3"
gem "airbrake", "~> 13.0.0"
gem "bootstrap", "~> 4.3"
gem "devise", "~> 4.7", github: "heartcombo/devise", ref: "f6e73e5" # NOTE: Rails 7.1.0 compat
gem "devise", "~> 4.9"
gem "devise-bootstrap-views", "~> 1.1"
gem "turbolinks", "~> 5.2"
gem "jquery-rails", "~> 4.3"
Expand Down
26 changes: 10 additions & 16 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,15 +1,3 @@
GIT
remote: https://github.com/heartcombo/devise.git
revision: f6e73e5b5c8f519f4be29ac9069c6ed8a2343ce4
ref: f6e73e5
specs:
devise (4.9.2)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 4.1.0)
responders
warden (~> 1.2.3)

GIT
remote: https://github.com/pioz/tvdb2.git
revision: e720ffbc28656b02a003c9513a3e4948557bfeeb
Expand Down Expand Up @@ -119,7 +107,7 @@ GEM
aws-sigv4 (1.8.0)
aws-eventstream (~> 1, >= 1.0.2)
base64 (0.2.0)
bcrypt (3.1.19)
bcrypt (3.1.20)
bigdecimal (3.1.4)
bootsnap (1.17.0)
msgpack (~> 1.2)
Expand All @@ -135,6 +123,12 @@ GEM
debug (1.9.1)
irb (~> 1.10)
reline (>= 0.3.8)
devise (4.9.3)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 4.1.0)
responders
warden (~> 1.2.3)
devise-bootstrap-views (1.1.0)
diff-lcs (1.5.0)
doorkeeper (5.6.8)
Expand Down Expand Up @@ -278,7 +272,7 @@ GEM
psych (>= 4.0.0)
reline (0.4.1)
io-console (~> 0.5)
responders (3.1.0)
responders (3.1.1)
actionpack (>= 5.2)
railties (>= 5.2)
rspec (3.12.0)
Expand Down Expand Up @@ -344,7 +338,7 @@ DEPENDENCIES
bootsnap
bootstrap (~> 4.3)
debug
devise (~> 4.7)!
devise (~> 4.9)
devise-bootstrap-views (~> 1.1)
doorkeeper (~> 5.3)
dotenv-rails (~> 2.7)
Expand All @@ -367,4 +361,4 @@ RUBY VERSION
ruby 3.2.2

BUNDLED WITH
2.4.20
2.5.3