lib/github_api/connection.rb in github_api-0.2.1 vs lib/github_api/connection.rb in github_api-0.2.2

@@ -35,15 +35,15 @@
 
     def connection(options = {}) # :nodoc:
 
       # parse(options['resource'], options['mime_type'] || mime_type) if options['mime_type']
       debugger
-
-      merged_options = if connection_options.empty?
-        header_options
-      else
-        connection_options.merge(header_options)
-      end
+#       merged_options = if connection_options.empty?
+#         header_options.merge(options)
+#       else
+#         connection_options.merge(header_options)
+#       end
+      merged_options = header_options.merge(options)
 
       clear_cache unless options.empty?
 
       @connection ||= begin
         Faraday.new(merged_options) do |builder|