diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-03-13 22:52:19 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2016-03-14 09:10:36 -0700 |
| commit | 3cc040e11083b80e3d1c872240e2420bf74ae170 (patch) | |
| tree | f36ef92b4c1ab4f8b290d40562146654a9883839 | |
| parent | d213758a9a8cee4f654fce9702e3954786961fae (diff) | |
| download | gitlab-ce-3cc040e11083b80e3d1c872240e2420bf74ae170.tar.gz | |
Bump Capybara gem to 2.6.2
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 5 |
3 files changed, 5 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG index b120810ebd8..8abab4f1418 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 8.6.0 (unreleased) - Support Golang subpackage fetching (Stan Hu) + - Bump Capybara gem to 2.6.2 (Stan Hu) - Contributions to forked projects are included in calendar - Improve the formatting for the user page bio (Connor Shea) - Removed the default password from the initial admin account created during @@ -273,7 +273,7 @@ group :development, :test do # Generate Fake data gem 'ffaker', '~> 2.0.0' - gem 'capybara', '~> 2.4.0' + gem 'capybara', '~> 2.6.2' gem 'capybara-screenshot', '~> 1.0.0' gem 'poltergeist', '~> 1.9.0' diff --git a/Gemfile.lock b/Gemfile.lock index d4e28db00d6..f719dd60e3f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -108,7 +108,8 @@ GEM thor (~> 0.18) byebug (8.2.1) cal-heatmap-rails (3.5.1) - capybara (2.4.4) + capybara (2.6.2) + addressable mime-types (>= 1.16) nokogiri (>= 1.3.3) rack (>= 1.0.0) @@ -901,7 +902,7 @@ DEPENDENCIES bundler-audit byebug cal-heatmap-rails (~> 3.5.0) - capybara (~> 2.4.0) + capybara (~> 2.6.2) capybara-screenshot (~> 1.0.0) carrierwave (~> 0.10.0) charlock_holmes (~> 0.7.3) |