Prepare for 2.6.0 release [ci skip]

History.md

@@ -1,7 +1,8 @@
-#Version 2.6.0
-Relase date: unreleased
+# Version 2.6.0
+Relase date: 2016-01-17
 
 ### Fixed
+* Fixed path escaping issue with current_path matchers [Tom Walpole, Luke Rollans] (Issue #1611)
 * Fixed circular require [David Rodríguez]
 * Capybara::RackTest::Form no longer overrides Object#method [David Rodriguez]
 * options and with_options filter for :select selector have more intuitive visibility behavior [Nathan]
@@ -9,6 +10,7 @@ Relase date: unreleased
 
 
 ### Added
+* Capybara.modify_selector [Tom Walpole]
 * xfeature and ffeature aliases added when using RSpec [Filip Bartuzi]
 * Selenium driver supports a :clear option to #set to handle different strategies for clearing a field [Tom Walpole]
 * Support the use of rack 2.0 with the rack_test driver [Travis Grathwell, Tom Walpole]

License.txt

@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2009-2012 Jonas Nicklas
+Copyright (c) 2009-2016 Jonas Nicklas
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

capybara.gemspec

@@ -10,13 +10,13 @@ Gem::Specification.new do |s|
   s.required_ruby_version = ">= 1.9.3"
   s.license = "MIT"
 
-  s.authors = ["Jonas Nicklas"]
-  s.email = ["jonas.nicklas@gmail.com"]
+  s.authors = ["Thomas Walpole", "Jonas Nicklas"]
+  s.email = ["twalpole@gmail.com", "jonas.nicklas@gmail.com"]
   s.description = "Capybara is an integration testing tool for rack based web applications. It simulates how a user would interact with a website"
 
   s.files = Dir.glob("{lib,spec}/**/*") + %w(README.md History.md License.txt)
 
-  s.homepage = "http://github.com/jnicklas/capybara"
+  s.homepage = "https://github.com/jnicklas/capybara"
   s.require_paths = ["lib"]
   s.rubygems_version = "1.3.6"
   s.summary = "Capybara aims to simplify the process of integration testing Rack applications, such as Rails, Sinatra or Merb"