Merge 24c9792 into 5121fde

.rubocop.yml

@@ -16,6 +16,9 @@ Metrics/ParameterLists:
   Max: 4
   CountKeywordArgs: true
 
+Metrics/AbcSize:
+  Enabled: false
+
 Style/AccessModifierIndentation:
   EnforcedStyle: outdent
 

lib/omniauth/strategy.rb

@@ -492,10 +492,10 @@ def merge_stack(stack)
 
     def ssl?
       request.env['HTTPS'] == 'on' ||
-      request.env['HTTP_X_FORWARDED_SSL'] == 'on' ||
-      request.env['HTTP_X_FORWARDED_SCHEME'] == 'https' ||
-      (request.env['HTTP_X_FORWARDED_PROTO'] && request.env['HTTP_X_FORWARDED_PROTO'].split(',')[0] == 'https') ||
-      request.env['rack.url_scheme'] == 'https'
+        request.env['HTTP_X_FORWARDED_SSL'] == 'on' ||
+        request.env['HTTP_X_FORWARDED_SCHEME'] == 'https' ||
+        (request.env['HTTP_X_FORWARDED_PROTO'] && request.env['HTTP_X_FORWARDED_PROTO'].split(',')[0] == 'https') ||
+        request.env['rack.url_scheme'] == 'https'
     end
   end
 end

spec/omniauth/strategy_spec.rb

@@ -337,7 +337,6 @@ def make_env(path = '/auth/test', props = {})
           expect { strategy.call(make_env('/auth/test/callback', env)) }.to raise_error('Callback Phase')
           expect(strategy.last_env['omniauth.origin']).to eq('http://example.com/sub_uri/origin')
         end
-
       end
     end
 

spec/omniauth_spec.rb

@@ -122,7 +122,7 @@ class ExampleStrategy
   describe '::Utils' do
     describe '.deep_merge' do
       it 'combines hashes' do
-        expect(OmniAuth::Utils.deep_merge({'abc' => {'def' => 123}}, {'abc' => {'foo' => 'bar'}})).to eq('abc' => {'def' => 123, 'foo' => 'bar'})
+        expect(OmniAuth::Utils.deep_merge({'abc' => {'def' => 123}}, 'abc' => {'foo' => 'bar'})).to eq('abc' => {'def' => 123, 'foo' => 'bar'})
       end
     end