3f5c36f1a4
Merge branch '2.6_stable'
...
* 2.6_stable:
tagged 2.6.2
update history [ci skip]
scope addressable
make sure we work with addressable < 2.4.0
allow for more versions of addressable
update history
tagged 2.6.1
Require addressable gem in CurrentPathQuery
fix typo in parameter name [ci skip]
2016-01-27 16:00:17 -08:00
959fddf44c
make sure we work with addressable < 2.4.0
2016-01-27 14:52:51 -08:00
f1ba67dfdf
sinatra merged to master
2016-01-27 08:57:11 -08:00
bad6d566f8
Lock mime-types < 3.0 when testing with ruby 1.9.3
2015-12-10 10:20:35 -08:00
06a7fce1df
Update base-versions Gemfile
2015-11-12 09:56:03 -08:00
b31c3dd561
Add rack and sinatra betas to beta-versions gemfile
2015-10-28 12:11:29 -07:00
5b1a4e844e
Don't specify fuubar in Gemfile.beta-versions as it was released
2014-08-24 15:13:24 +03:00
5906cb6496
RSpec3 no longer beta
2014-06-12 12:27:51 -07:00
a4b694bd8c
Allow to use markdown in yard docs and write better documentation for session's reset method
2014-04-03 22:52:38 +03:00
ba37f78692
Update all tests to "expect" format and add support for RSpec 3 usage
...
Swap from :skip to :capybara_skip since :skip is now used by RSpec 3
Add rspec 3 testing to beta gemfile
2014-04-02 14:33:26 -07:00
c43cbb3956
Fix xpath in base versions gemfile
2013-03-18 23:39:45 +01:00
53bfdcafc3
Add Gemfile.base-versions for Travis
2012-01-26 21:18:40 +01:00
Thomas Walpole