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

Fix a force ssl redirection bug that occur when session store disabled. #27140

Merged
merged 2 commits into from Nov 25, 2016
Merged

Fix a force ssl redirection bug that occur when session store disabled. #27140

merged 2 commits into from Nov 25, 2016

Conversation

@supercaracal
Copy link
Contributor

@supercaracal supercaracal commented Nov 22, 2016

@rails-bot
Copy link

@rails-bot rails-bot commented Nov 22, 2016

Thanks for the pull request, and welcome! The Rails team is excited to review your changes, and you should hear from @rafaelfranca (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

This repository is being automatically checked for code quality issues using Code Climate. You can see results for this analysis in the PR status below. Newly introduced issues should be fixed before a Pull Request is considered ready to review.

Please see the contribution instructions for more information.

@supercaracal
Copy link
Contributor Author

@supercaracal supercaracal commented Nov 22, 2016

PG::TRDeadlockDetected: ERROR: deadlock detected
SQLite3::BusyException: database is locked: DELETE FROM "delayed_jobs"

They're not seem to be related. Can I rerun this CI?

@prathamesh-sonpatki
Copy link
Member

@prathamesh-sonpatki prathamesh-sonpatki commented Nov 22, 2016

Restarted the build, we can ignore that failure if it happens again.

@@ -92,6 +92,22 @@ def cheeseburger
end
end

class RedirectToSSLIfSessionStoreDisabled < ForceSSLController

This comment has been minimized.

@rafaelfranca

rafaelfranca Nov 24, 2016
Member

This is testing an implementation detail. Can we test it at integration level so we don't need to mock the request object?

This comment has been minimized.

@supercaracal

supercaracal Nov 24, 2016
Author Contributor

I changed at da1453e @rafaelfranca

This comment has been minimized.

@supercaracal

supercaracal Nov 24, 2016
Author Contributor

Build failed. But we can ignore that.

PG::TRDeadlockDetected: ERROR: deadlock detected

@rafaelfranca rafaelfranca merged commit 6c87323 into rails:master Nov 25, 2016
0 of 2 checks passed
0 of 2 checks passed
continuous-integration/travis-ci/pr The Travis CI build could not complete due to an error
Details
codeclimate Code Climate is analyzing this code.
Details
rafaelfranca added a commit that referenced this pull request Nov 25, 2016
…store-disabled

Fix a force ssl redirection bug that occur when session store disabled.
@rafaelfranca
Copy link
Member

@rafaelfranca rafaelfranca commented Nov 25, 2016

Backported in c1f990c

@supercaracal supercaracal deleted the supercaracal:fix-force-ssl-if-session-store-disabled branch Nov 25, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants