Skip to content

Commit 8a1b765

Browse files
committed
rollback some changes
1 parent 3fa5fbd commit 8a1b765

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

devise_token_auth.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@ Gem::Specification.new do |s|
3030
s.add_development_dependency 'sqlite3', '~> 1.4'
3131
s.add_development_dependency 'pg'
3232
s.add_development_dependency 'mysql2'
33-
s.add_development_dependency 'mongoid', '>= 4', '< 10'
33+
s.add_development_dependency 'mongoid', '>= 4', '< 8'
3434
s.add_development_dependency 'mongoid-locker', '~> 2.0'
3535
end

test/dummy/config/initializers/omniauth.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# frozen_string_literal: true
22

3-
OmniAuth.config.path_prefix = '/auth'
4-
OmniAuth.config.request_validation_phase = nil # This might be needed for Rails 7.1
3+
# OmniAuth.config.path_prefix = '/auth'
4+
# OmniAuth.config.request_validation_phase = nil # This might be needed for Rails 7.1
55

66
Rails.application.config.middleware.use OmniAuth::Builder do |b|
77
provider :github, ENV['GITHUB_KEY'], ENV['GITHUB_SECRET'], scope: 'email,profile'

test/test_helper.rb

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,14 @@
3131

3232
class ActionDispatch::IntegrationTest
3333
def follow_all_redirects!
34-
while response.status.to_s =~ /^3\d{2}/
35-
original_params = request.params.to_h
36-
follow_redirect! do |req|
37-
# Preserve all original parameters through redirects
38-
req.params.merge!(original_params)
39-
end
40-
end
34+
follow_redirect! while response.status.to_s =~ /^3\d{2}/
35+
# while response.status.to_s =~ /^3\d{2}/
36+
# original_params = request.params.to_h
37+
# follow_redirect! do |req|
38+
# # Preserve all original parameters through redirects
39+
# req.params.merge!(original_params)
40+
# end
41+
# end
4142
end
4243
end
4344

0 commit comments

Comments
 (0)