-
-
Notifications
You must be signed in to change notification settings - Fork 975
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
Allow Hashie version 4.0.x #977
Merged
Merged
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
07b28f4
Allow Hashie version 4.0.0
BobbyMcWho d66ae2f
Update travis to use appropriate bundler
BobbyMcWho 677978d
Lock rubocop to ruby 2.2 compatible version
BobbyMcWho 868276c
rubygems > 3 breaks ci on ruby 2.2
BobbyMcWho 8aec527
indent module_function for rubocop
BobbyMcWho bec4b70
privatize rack checks
BobbyMcWho 15942b6
conflicting rubocop rules
BobbyMcWho b0a1c98
Increase builder code coverage
BobbyMcWho 8dbc435
Reset config options in between tests
BobbyMcWho 10f4179
Rubocop less than 0.69.0 for Ruby 2.2 target
BobbyMcWho 473486c
Use specific bundler
BobbyMcWho c85c717
Remove init code for builder
BobbyMcWho File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,24 +1,5 @@ | ||
module OmniAuth | ||
class Builder < ::Rack::Builder | ||
def initialize(app, &block) | ||
@options = nil | ||
if rack14? || rack2? | ||
super | ||
else | ||
@app = app | ||
super(&block) | ||
@ins << @app | ||
end | ||
end | ||
|
||
def rack14? | ||
Rack.release.start_with?('1.') && (Rack.release.split('.')[1].to_i >= 4) | ||
end | ||
|
||
def rack2? | ||
Rack.release.start_with? '2.' | ||
end | ||
|
||
Comment on lines
-3
to
-21
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Now that we've locked rack above 1.6, we don't need any of this anymore. |
||
def on_failure(&block) | ||
OmniAuth.config.on_failure = block | ||
end | ||
|
@@ -40,7 +21,7 @@ def configure(&block) | |
end | ||
|
||
def options(options = false) | ||
return @options || {} if options == false | ||
return @options ||= {} if options == false | ||
|
||
@options = options | ||
end | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
bundler 2 doesn't work on ruby < 2.3