Merge branch 'master' into rubocop-Lint-AssignmentInCondition

.rubocop_todo.yml

@@ -185,13 +185,6 @@ Layout/SpaceInsidePercentLiteralDelimiters:
   Exclude:
     - 'lib/faraday/adapter/rack.rb'
 
-# Offense count: 30
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: final_newline, final_blank_line
-Layout/TrailingBlankLines:
-  Enabled: false
-
 # Offense count: 6
 # Cop supports --auto-correct.
 # Configuration parameters: AllowInHeredoc.

Gemfile

@@ -13,18 +13,15 @@ group :development, :test do
 end
 
 group :test do
-  gem 'addressable', '< 2.4.0'
   gem 'coveralls', :require => false
   gem 'em-http-request', '>= 1.1', :require => 'em-http'
   gem 'em-synchrony', '>= 1.0.3', :require => ['em-synchrony', 'em-synchrony/em-http']
   gem 'excon', '>= 0.27.4'
   gem 'httpclient', '>= 2.2'
-  gem 'mime-types', '~> 1.25', :platforms => [:jruby, :ruby_18]
   gem 'minitest', '>= 5.0.5'
   gem 'net-http-persistent'
   gem 'patron', '>= 0.4.2', :platforms => :ruby
   gem 'rack-test', '>= 0.6', :require => 'rack/test'
-  gem 'rest-client', '~> 1.6.0', :platforms => [:jruby, :ruby_18]
   gem 'rspec', '~> 3.7'
   gem 'rubocop', '~> 0.65.0'
   gem 'simplecov'
@@ -34,4 +31,3 @@ group :test do
 end
 
 gemspec
-

lib/faraday/request/authorization.rb

@@ -49,4 +49,3 @@ module Faraday
     end
   end
 end
-

lib/faraday/request/basic_authentication.rb

@@ -16,4 +16,3 @@ module Faraday
     end
   end
 end
-

lib/faraday/request/token_authentication.rb

@@ -14,4 +14,3 @@ module Faraday
     end
   end
 end
-